diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-12-16 15:48:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-12-16 15:48:23 +0000 |
| commit | b68de2323d6444b4b3685a98bbcb9500a38e45cb (patch) | |
| tree | 6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/install/install_update.php | |
| parent | 51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff) | |
| download | forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2 forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip | |
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index ab7ec35705..9f5a428029 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -262,6 +262,16 @@ class install_update extends module $template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']); } + // Since some people try to update to RC releases, but phpBB.com tells them the last version is the version they currently run + // we are faced with the updater thinking the database schema is up-to-date; which it is, but should be updated none-the-less + // We now try to cope with this by triggering the update process + if (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->update_info['version']['to'])), '<')) + { + $template->assign_vars(array( + 'S_UP_TO_DATE' => false, + )); + } + break; case 'update_db': @@ -917,7 +927,7 @@ class install_update extends module { if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/')) { - trigger_error(sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $phpbb_root_path . 'store/'), E_USER_ERROR); + trigger_error(sprintf('The directory “%s” is not writable.', $phpbb_root_path . 'store/'), E_USER_ERROR); } if ($use_method == '.zip') |