Index: branches/unlabeled/unlabeled-1.25.2/kernel/units/admin/admin_tag_processor.php =================================================================== diff -u -r6695 -r6717 --- branches/unlabeled/unlabeled-1.25.2/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 6695) +++ branches/unlabeled/unlabeled-1.25.2/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 6717) @@ -488,6 +488,13 @@ return $timestamp; } + + function CheckPermCache($params) + { + if ($this->Conn->GetOne('SELECT Data FROM '.TABLE_PREFIX.'Cache WHERE VarName = \'ForcePermCacheUpdate\'')) { + $this->Application->Redirect($params['cache_update_t'], array('continue' => 1)); + } + } } ?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/sections_list.tpl =================================================================== diff -u -r5450 -r6717 --- branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 5450) +++ branches/unlabeled/unlabeled-1.9.2/kernel/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 6717) @@ -1,4 +1,5 @@ + @@ -16,7 +17,7 @@ - + @@ -41,12 +42,12 @@ - + - + Index: branches/unlabeled/unlabeled-1.7.2/core/units/categories/cache_updater.php =================================================================== diff -u -r6142 -r6717 --- branches/unlabeled/unlabeled-1.7.2/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 6142) +++ branches/unlabeled/unlabeled-1.7.2/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 6717) @@ -223,6 +223,7 @@ function clearData() { $this->Conn->Query('DROP TABLE IF EXISTS '.$this->table); + $this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = \'ForcePermCacheUpdate\''); } function DoTheJob() Index: branches/unlabeled/unlabeled-1.7.2/kernel/units/categories/cache_updater.php =================================================================== diff -u -r6142 -r6717 --- branches/unlabeled/unlabeled-1.7.2/kernel/units/categories/cache_updater.php (.../cache_updater.php) (revision 6142) +++ branches/unlabeled/unlabeled-1.7.2/kernel/units/categories/cache_updater.php (.../cache_updater.php) (revision 6717) @@ -223,6 +223,7 @@ function clearData() { $this->Conn->Query('DROP TABLE IF EXISTS '.$this->table); + $this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = \'ForcePermCacheUpdate\''); } function DoTheJob() Index: branches/unlabeled/unlabeled-1.108.2/admin/install.php =================================================================== diff -u -r6675 -r6717 --- branches/unlabeled/unlabeled-1.108.2/admin/install.php (.../install.php) (revision 6675) +++ branches/unlabeled/unlabeled-1.108.2/admin/install.php (.../install.php) (revision 6717) @@ -1343,16 +1343,6 @@ } } -if ($state == "finish") { - $ado =& inst_GetADODBConnection(); - $PhraseTable = $g_TablePrefix."ImportPhrases"; - $EventTable = $g_TablePrefix."ImportEvents"; - $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); - $ado->Execute("DROP TABLE IF EXISTS $EventTable"); - - $include_file = $pathtoroot.$admin."/install/install_finish.php"; -} - if($state=="RootSetPass") { $pass = $_POST["RootPass"]; @@ -1764,6 +1754,17 @@ echo ""; } +if ($state == "finish") { + $ado =& inst_GetADODBConnection(); + $PhraseTable = $g_TablePrefix."ImportPhrases"; + $EventTable = $g_TablePrefix."ImportEvents"; + $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); + $ado->Execute("DROP TABLE IF EXISTS $EventTable"); + $ado->Execute('INSERT INTO '.$g_TablePrefix.'Cache (VarName, Data) VALUES (\'ForcePermCacheUpdate\', \'1\')'); + + $include_file = $pathtoroot.$admin."/install/install_finish.php"; +} + // init variables $vars = Array('db_error','restore_error','PassError','DomainError','login_error','inst_error'); foreach($vars as $var_name) ReSetVar($var_name); Index: branches/unlabeled/unlabeled-1.19.2/kernel/admin_templates/incs/header.tpl =================================================================== diff -u -r6108 -r6717 --- branches/unlabeled/unlabeled-1.19.2/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 6108) +++ branches/unlabeled/unlabeled-1.19.2/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 6717) @@ -44,4 +44,4 @@ - \ No newline at end of file +