diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-07-10 16:18:57 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-07-10 16:18:57 +0000 |
| commit | 49e78aa98c36c04737649d17c8ace1d80f6f2328 (patch) | |
| tree | 95d7e2e9967b1f1f52b1f291541fd5200b019291 | |
| parent | 2d5298e8e1a4c8da2f0db71d63196aae1cad5fe1 (diff) | |
| download | forums-49e78aa98c36c04737649d17c8ace1d80f6f2328.tar forums-49e78aa98c36c04737649d17c8ace1d80f6f2328.tar.gz forums-49e78aa98c36c04737649d17c8ace1d80f6f2328.tar.bz2 forums-49e78aa98c36c04737649d17c8ace1d80f6f2328.tar.xz forums-49e78aa98c36c04737649d17c8ace1d80f6f2328.zip | |
#13207
git-svn-id: file:///svn/phpbb/trunk@7861 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rwxr-xr-x | phpBB/install/index.php | 3 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c57a4b19a4..9995c719fb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -202,6 +202,7 @@ p a { <li>[Fix] Make the window showing file differences a little wider (Bug #13157)</li> <li>[Fix] Preserve preview style on search form (Bug #13205)</li> <li>[Fix] Place attachment filename in new line in posting editor (Bug #9726)</li> + <li>[Fix] Don't allow caching to occur in the update sequence (Bug #13207)</li> </ul> diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 101ea8e0c6..e6eb9c2bbc 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -225,6 +225,9 @@ $config = array( $template->set_custom_template('../adm/style', 'admin'); $template->assign_var('T_TEMPLATE_PATH', '../adm/style'); +// the acp template is never stored in the database +$user->theme['template_storedb'] = false; + $install = new module(); $install->create('install', "index.$phpEx", $mode, $sub); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 0e97750c9f..2140e557e4 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -126,6 +126,9 @@ class install_update extends module // Set custom template again. ;) $template->set_custom_template('../adm/style', 'admin'); + // still, the acp template is never stored in the database + $user->theme['template_storedb'] = false; + // Get current and latest version if (($latest_version = $cache->get('_version_info')) === false) { |