diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index b5f1a4f52f..ea9d050b60 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -32,7 +32,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base var $must_exclude_one_ids = array(); private $phpbb_root_path; - private $phpEx; + private $php_ext; private $config; private $db; private $user; @@ -45,7 +45,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user) { $this->phpbb_root_path = $phpbb_root_path; - $this->phpEx = $phpEx; + $this->php_ext = $phpEx; $this->config = $config; $this->db = $db; $this->user = $user; @@ -57,7 +57,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base */ if (!class_exists('utf_normalizer')) { - include($this->phpbb_root_path . 'includes/utf/utf_normalizer.' . $this->phpEx); + include($this->phpbb_root_path . 'includes/utf/utf_normalizer.' . $this->php_ext); } $error = false; @@ -1669,7 +1669,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base if (!isset($conv_loaded[$idx])) { $conv_loaded[$idx] = 1; - $file = $this->phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $this->phpEx; + $file = $this->phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $this->php_ext; if (file_exists($file)) { diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index d4ded8efc0..d10d5d4942 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -34,7 +34,7 @@ class phpbb_search_fulltext_sphinx private $indexes; private $sphinx; private $phpbb_root_path; - private $phpEx; + private $php_ext; private $auth; private $config; private $db; @@ -54,7 +54,7 @@ class phpbb_search_fulltext_sphinx public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user) { $this->phpbb_root_path = $phpbb_root_path; - $this->phpEx = $phpEx; + $this->php_ext = $phpEx; $this->config = $config; $this->user = $user; $this->db = $db; @@ -62,7 +62,7 @@ class phpbb_search_fulltext_sphinx if (!class_exists('phpbb_db_tools')) { - require($this->phpbb_root_path . 'includes/db/db_tools.' . $this->phpEx); + require($this->phpbb_root_path . 'includes/db/db_tools.' . $this->php_ext); } // Initialize phpbb_db_tools object @@ -77,7 +77,7 @@ class phpbb_search_fulltext_sphinx if (!class_exists('SphinxClient')) { - require($this->phpbb_root_path . 'includes/sphinxapi.' . $this->phpEx); + require($this->phpbb_root_path . 'includes/sphinxapi.' . $this->php_ext); } // Initialize sphinx client @@ -151,7 +151,7 @@ class phpbb_search_fulltext_sphinx return false; } - include($this->phpbb_root_path . 'config.' . $this->phpEx); + include($this->phpbb_root_path . 'config.' . $this->php_ext); /* Now that we're sure everything was entered correctly, generate a config for the index. We use a config value