[phpwiki-checkins] SF.net SVN: phpwiki:[9061] trunk

[<var...@us...>]

Revision: 9061
          http://sourceforge.net/p/phpwiki/code/9061
Author:   vargenau
Date:     2014-09-04 15:38:45 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
fix Bug#456 'Optimizing Database' message sometimes printed on page

Modified Paths:
--------------
    trunk/lib/WikiDB.php
    trunk/lib/main.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2014-09-01 10:14:55 UTC (rev 9060)
+++ trunk/lib/WikiDB.php	2014-09-04 15:38:45 UTC (rev 9061)
@@ -1034,8 +1034,9 @@
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))
         ) {
             if ($backend->optimize()) {
-                if ((int)DEBUG)
+                if ((int)DEBUG) {
                     trigger_error(_("Optimizing database"), E_USER_NOTICE);
+                }
             }
         }
 

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2014-09-01 10:14:55 UTC (rev 9060)
+++ trunk/lib/main.php	2014-09-04 15:38:45 UTC (rev 9061)
@@ -107,8 +107,11 @@
             or (DATABASE_OPTIMISE_FREQUENCY > 0 and
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))
         ) {
-            if ($this->_dbi->_backend->optimize())
-                trigger_error(_("Optimizing database"), E_USER_NOTICE);
+            if ($this->_dbi->_backend->optimize()) {
+                if ((int)DEBUG) {
+                    trigger_error(_("Optimizing database"), E_USER_NOTICE);
+                }
+            }
         }
 
         // Restore auth state. This doesn't check for proper authorization!

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-01 10:14:55 UTC (rev 9060)
+++ trunk/pgsrc/ReleaseNotes	2014-09-04 15:38:45 UTC (rev 9061)
@@ -1,4 +1,4 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
+Date: Thu,  4 Sep 2014 17:37:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,6 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
+== 1.5.1 2014-09-xx Marc-Etienne Vargenau ==
+
+* fix Bug#456 'Optimizing Database' message sometimes printed on page 
+
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 
 === Main Changes ===

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.