diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-26 18:55:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-26 18:55:28 +0000 |
| commit | 00ad9cc4987665934bd7176026072d0c256fd2f3 (patch) | |
| tree | 7c0b5eef39a7076a6ed7a92fa32e38fa3033c595 /phpBB/includes | |
| parent | cf8c2a7df105546402e2eb48750e76c3dd02a949 (diff) | |
| download | forums-00ad9cc4987665934bd7176026072d0c256fd2f3.tar forums-00ad9cc4987665934bd7176026072d0c256fd2f3.tar.gz forums-00ad9cc4987665934bd7176026072d0c256fd2f3.tar.bz2 forums-00ad9cc4987665934bd7176026072d0c256fd2f3.tar.xz forums-00ad9cc4987665934bd7176026072d0c256fd2f3.zip | |
language additions
some small fixes
git-svn-id: file:///svn/phpbb/trunk@4893 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acm/acm_file.php | 15 | ||||
| -rw-r--r-- | phpBB/includes/db/mysql.php | 10 |
2 files changed, 24 insertions, 1 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index 229685d431..27a126dc84 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -28,7 +28,14 @@ class acm function load() { global $phpEx; - @include($this->cache_dir . 'data_global.' . $phpEx); + if (file_exists($this->cache_dir . 'data_global.' . $phpEx)) + { + @include($this->cache_dir . 'data_global.' . $phpEx); + } + else + { + return false; + } } function unload() @@ -230,7 +237,13 @@ class acm $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); $query_id = 'Cache id #' . count($this->sql_rowset); + if (!file_exists($this->cache_dir . 'sql_' . md5($query) . ".$phpEx")) + { + return false; + } + @include($this->cache_dir . 'sql_' . md5($query) . ".$phpEx"); + if (!isset($expired)) { return FALSE; diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index abfdd576f6..ccaca5e884 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -345,6 +345,16 @@ class sql_db $query_id = $this->query_result; } + if ($query_id) + { + // If it is not found within the open queries, we try to free a cached result. ;) + if (!(array_search($query_id, $this->open_queries) > 0)) + { + return false; + } + unset($this->open_queries[array_search($query_id, $this->open_queries)]); + } + return ($query_id) ? @mysql_free_result($query_id) : false; } |