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] = '';
 			}