aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-01-28 20:45:42 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-01-28 20:45:42 +0000
commit043d45c35743c8b00940ef208f49faeb035007a3 (patch)
treed2afd45f945d6e38f7f9afc72db3817cbf343eb5 /phpBB
parent4ce762b83b61541e860e2244d459cc4be1a73640 (diff)
downloadforums-043d45c35743c8b00940ef208f49faeb035007a3.tar
forums-043d45c35743c8b00940ef208f49faeb035007a3.tar.gz
forums-043d45c35743c8b00940ef208f49faeb035007a3.tar.bz2
forums-043d45c35743c8b00940ef208f49faeb035007a3.tar.xz
forums-043d45c35743c8b00940ef208f49faeb035007a3.zip
Missing cache save from page_footer() + unecessary cache update for word censors
git-svn-id: file:///svn/phpbb/trunk@3395 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/admin/admin_words.php19
-rw-r--r--phpBB/admin/pagestart.php7
2 files changed, 6 insertions, 20 deletions
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index 628e0318f3..fb92a75785 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -167,25 +167,6 @@ if ($mode != '')
}
- $sql = "SELECT *
- FROM " . WORDS_TABLE . "
- ORDER BY word";
- $result = $db->sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
- {
- $censors = array();
- do
- {
- $censors['match'][] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i';
- $censors['replace'][] = $row['replacement'];
- }
- while ($row = $db->sql_fetchrow($result));
-
- $cache->put('word_censors', $censors);
- }
- $db->sql_freeresult($result);
-
trigger_error($message);
}
diff --git a/phpBB/admin/pagestart.php b/phpBB/admin/pagestart.php
index 9460f86582..e2096baf4f 100644
--- a/phpBB/admin/pagestart.php
+++ b/phpBB/admin/pagestart.php
@@ -101,7 +101,7 @@ td.cat { background-image: url('images/cellpic1.gif') }
function page_footer($copyright_html = true)
{
- global $config, $db, $phpEx;
+ global $cache, $config, $db, $phpEx;
// Close our DB connection.
$db->sql_close();
@@ -127,6 +127,11 @@ function page_footer($copyright_html = true)
}
+ if (!empty($cache))
+ {
+ $cache->save_cache();
+ }
+
exit;
}