diff options
author | Marek A. R <aptx@phpbb.com> | 2008-07-13 19:08:30 +0000 |
---|---|---|
committer | Marek A. R <aptx@phpbb.com> | 2008-07-13 19:08:30 +0000 |
commit | e0799b79e2e1b9223af2d838f31966d25418af24 (patch) | |
tree | 3339dbd25db27f79383409e8d770e94a8436d0b7 /phpBB/includes/acm/acm_file.php | |
parent | 95462dca5876809b70daca6eda3b170fe706bea2 (diff) | |
download | forums-e0799b79e2e1b9223af2d838f31966d25418af24.tar forums-e0799b79e2e1b9223af2d838f31966d25418af24.tar.gz forums-e0799b79e2e1b9223af2d838f31966d25418af24.tar.bz2 forums-e0799b79e2e1b9223af2d838f31966d25418af24.tar.xz forums-e0799b79e2e1b9223af2d838f31966d25418af24.zip |
Fix file ACM to work with cached single-quotes and other characters that could need escaping.
git-svn-id: file:///svn/phpbb/trunk@8681 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm/acm_file.php')
-rw-r--r-- | phpBB/includes/acm/acm_file.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index 9376549cba..d8477376ea 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -80,7 +80,7 @@ class acm if ($fp = @fopen($this->cache_dir . 'data_global.' . PHP_EXT, 'wb')) { @flock($fp, LOCK_EX); - fwrite($fp, "<?php\n\$this->vars = unserialize('" . serialize($this->vars) . "');\n\$this->var_expires = unserialize('" . serialize($this->var_expires) . "');"); + fwrite($fp, "<?php\n\$this->vars = unserialize(" . var_export(serialize($this->vars), true) . ");\n\$this->var_expires = unserialize(" . var_export(serialize($this->var_expires), true) . ");"); @flock($fp, LOCK_UN); fclose($fp); @@ -178,7 +178,7 @@ class acm if ($fp = @fopen($this->cache_dir . "data{$var_name}." . PHP_EXT, 'wb')) { @flock($fp, LOCK_EX); - fwrite($fp, "<?php\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\$data = " . (sizeof($var) ? "unserialize('" . serialize($var) . "');" : 'array();')); + fwrite($fp, "<?php\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\$data = " . (sizeof($var) ? "unserialize(" . var_export(serialize($var), true) . ");" : 'array();')); @flock($fp, LOCK_UN); fclose($fp); @@ -388,7 +388,7 @@ class acm $file = "<?php\n/* " . str_replace('*/', '*\/', $query) . " */"; $file .= "\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n"; - fwrite($fp, $file . "\$this->sql_rowset[\$query_id] = " . (sizeof($this->sql_rowset[$query_id]) ? "unserialize('" . serialize($this->sql_rowset[$query_id]) . "');" : 'array();')); + fwrite($fp, $file . "\$this->sql_rowset[\$query_id] = " . (sizeof($this->sql_rowset[$query_id]) ? "unserialize(" . var_export(serialize($this->sql_rowset[$query_id]), true) . ");" : 'array();')); @flock($fp, LOCK_UN); fclose($fp); |