Changeset 3073

Timestamp:

01/13/09 19:56:17 (4 years ago)

Author:

rub

Message:

merge -c3072 from trunk to branch 2.0

Fix bad $lang.
Remove not necessary information messages on upgrade.

Location:

branches/2.0

Files:

• admin/include/functions.php (modified) (2 diffs)
• upgrade.php (modified) (2 diffs)

branches/2.0/admin/include/functions.php

@@ -1599 +1599 @@
  * Do maintenance on all PWG tables
  *
- * @return nono
+ * @return none
  */
 function do_maintenance_all_tables()
@@ -1648 +1648 @@
     array_push(
           $page['infos'],
-          l10n('Optimization completed')
+          l10n('Optimizations completed')
           );
   }

branches/2.0/upgrade.php

@@ -299 +299 @@
       );
 
+    // Save $page['infos'] in order to restore after maintenance actions
+    $page['infos_sav'] = $page['infos'];
+    $page['infos'] = array();
+
     // c13y_upgrade plugin means "check integrity after upgrade", so it
     // becomes useful just after an upgrade
@@ -315 +319 @@
     do_maintenance_all_tables();
 
+    // Restore $page['infos'] in order to hide informations messages from functions calles
+    // errors messages are not hide
+    $page['infos'] = $page['infos_sav'];
+
   }
 }