aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2009-01-13 18:56:17 +0000
committerrub <rub@piwigo.org>2009-01-13 18:56:17 +0000
commit882ffed349cc7bcc68a7f14cd019431bc2bb29fc (patch)
tree919b17ce98a2012c6b19a045689aa61122ce63b9
parent644f226af6b550288a2a0f07b6e42e5ffce63f5d (diff)
merge -c3072 from trunk to branch 2.0
Fix bad $lang. Remove not necessary information messages on upgrade. git-svn-id: http://piwigo.org/svn/branches/2.0@3073 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php4
-rw-r--r--upgrade.php8
2 files changed, 10 insertions, 2 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index d89d2bf33..86d274687 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1598,7 +1598,7 @@ DELETE
/**
* Do maintenance on all PWG tables
*
- * @return nono
+ * @return none
*/
function do_maintenance_all_tables()
{
@@ -1647,7 +1647,7 @@ function do_maintenance_all_tables()
{
array_push(
$page['infos'],
- l10n('Optimization completed')
+ l10n('Optimizations completed')
);
}
else
diff --git a/upgrade.php b/upgrade.php
index 1a0a7f4b0..daee09113 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -298,6 +298,10 @@ if (isset($_POST['submit']) and check_upgrade())
l10n('perform a maintenance check')
);
+ // 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
$query = '
@@ -314,6 +318,10 @@ REPLACE INTO '.PLUGINS_TABLE.'
// Tables Maintenance
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'];
+
}
}