diff options
| -rw-r--r-- | app/i18n/en.php | 2 | ||||
| -rw-r--r-- | app/i18n/fr.php | 2 | ||||
| -rw-r--r-- | p/i/install.php | 12 |
3 files changed, 11 insertions, 5 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 40c634f7c..f74a7f198 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -60,7 +60,7 @@ return array ( 'access_denied' => 'You don’t have permission to access this page', 'page_not_found' => 'You are looking for a page which doesn’t exist', 'error_occurred' => 'An error occurred', - 'error_occurred_update' => 'An error occurred during update', + 'error_occurred_update' => 'Nothing was changed', 'default_category' => 'Uncategorized', 'categories_updated' => 'Categories have been updated', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 14160bb7e..f9c4d00cc 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -60,7 +60,7 @@ return array ( 'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page', 'page_not_found' => 'La page que vous cherchez n’existe pas', 'error_occurred' => 'Une erreur est survenue', - 'error_occurred_update' => 'Une erreur est survenue lors de la mise à jour', + 'error_occurred_update' => 'Rien n’a été modifié', 'default_category' => 'Sans catégorie', 'categories_updated' => 'Les catégories ont été mises à jour', diff --git a/p/i/install.php b/p/i/install.php index fa37ae19a..8db372fef 100644 --- a/p/i/install.php +++ b/p/i/install.php @@ -117,7 +117,9 @@ WHERE e1.content_bin IS NULL'); define('SQL_CONVERT_UPDATEv006', 'UPDATE `%1$sentry` SET content_bin=COMPRESS(?) WHERE id=?;'); -define('SQL_UPDATE_CACHED_VALUESv006', ' +define('SQL_DROP_BACKUPv006', 'DROP TABLE IF EXISTS `%1$sentry006`, `%1$sfeed006`, `%1$scategory006`;'); + +define('SQL_UPDATE_CACHED_VALUES', ' UPDATE `%1$sfeed` f INNER JOIN ( SELECT e.id_feed, @@ -129,7 +131,7 @@ INNER JOIN ( SET f.cache_nbEntries=x.nbEntries, f.cache_nbUnreads=x.nbUnreads '); -define('SQL_DROP_BACKUPv006', 'DROP TABLE IF EXISTS `%1$sentry006`, `%1$sfeed006`, `%1$scategory006`;'); +define('SQL_UPDATE_HISTORYv007b', 'UPDATE `%1$sfeed` SET keep_history = CASE WHEN keep_history = 0 THEN -2 WHEN keep_history = 1 THEN -1 ELSE keep_history END;'); //</updates> function writeLine ($f, $line) { @@ -349,7 +351,11 @@ function updateDatabase($perform = false) { $stm->execute(); } - $sql = sprintf(SQL_UPDATE_CACHED_VALUESv006, $_SESSION['bd_prefix_user']); + $sql = sprintf(SQL_UPDATE_HISTORYv007b, $_SESSION['bd_prefix_user']); + $stm = $c->prepare($sql); + $stm->execute(); + + $sql = sprintf(SQL_UPDATE_CACHED_VALUES, $_SESSION['bd_prefix_user']); $stm = $c->prepare($sql); $stm->execute(); |