aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-03-20 03:40:18 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-03-20 03:40:18 +0000
commit16d26c106b8049605aeb7a672d38ec20baa4c59a (patch)
tree49d1882fc4b4f31db9aa9a692ce2aa9783cfd469
parent8dcda2ce5598a6a0c743e6cbb7da2caf7024e49b (diff)
downloadforums-16d26c106b8049605aeb7a672d38ec20baa4c59a.tar
forums-16d26c106b8049605aeb7a672d38ec20baa4c59a.tar.gz
forums-16d26c106b8049605aeb7a672d38ec20baa4c59a.tar.bz2
forums-16d26c106b8049605aeb7a672d38ec20baa4c59a.tar.xz
forums-16d26c106b8049605aeb7a672d38ec20baa4c59a.zip
#5137
git-svn-id: file:///svn/phpbb/trunk@7211 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acm/acm_file.php1
-rw-r--r--phpBB/includes/functions_convert.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 63b24a8d07..9700b6ee8d 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -20,6 +20,7 @@ class acm
var $sql_rowset = array();
var $sql_row_pointer = array();
+ var $cache_dir = '';
/**
* Set cache path
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 559921ba35..f2988792a6 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1307,7 +1307,7 @@ function get_path($src_path, $src_url, $test_file)
$url_parts = explode('/', $m[2]);
if (substr($src_url, -1) != '/')
{
- if (preg_match('/.*\.([a-z0-9]{3,4})$/i', $url_parts[count($url_parts) - 1]))
+ if (preg_match('/.*\.([a-z0-9]{3,4})$/i', $url_parts[sizeof($url_parts) - 1]))
{
$url_parts[sizeof($url_parts) - 1] = '';
}