makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11011] rename property phpEx to php_ext

Browse source 
PHPBB3-11011
This commit is contained in:
Dhruv 2012-08-08 11:16:46 +05:30
parent 794d6ec443
commit a422ddfe31
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/search/fulltext_native.php
View file

@ -32,7 +32,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
var $must_exclude_one_ids = array(); var $must_exclude_one_ids = array();
private $phpbb_root_path; private $phpbb_root_path;
private $phpEx; private $php_ext;
private $config; private $config;
private $db; private $db;
private $user; 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) public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = $phpEx; $this->php_ext = $phpEx;
$this->config = $config; $this->config = $config;
$this->db = $db; $this->db = $db;
$this->user = $user; $this->user = $user;
@ -57,7 +57,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
*/ */
if (!class_exists('utf_normalizer')) 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; $error = false;
@ -1669,7 +1669,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
if (!isset($conv_loaded[$idx])) if (!isset($conv_loaded[$idx]))
{ {
$conv_loaded[$idx] = 1; $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)) if (file_exists($file))
{ {

10
phpBB/includes/search/fulltext_sphinx.php
View file

@ -34,7 +34,7 @@ class phpbb_search_fulltext_sphinx
private $indexes; private $indexes;
private $sphinx; private $sphinx;
private $phpbb_root_path; private $phpbb_root_path;
private $phpEx; private $php_ext;
private $auth; private $auth;
private $config; private $config;
private $db; private $db;
@ -54,7 +54,7 @@ class phpbb_search_fulltext_sphinx
public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user) public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = $phpEx; $this->php_ext = $phpEx;
$this->config = $config; $this->config = $config;
$this->user = $user; $this->user = $user;
$this->db = $db; $this->db = $db;
@ -62,7 +62,7 @@ class phpbb_search_fulltext_sphinx
if (!class_exists('phpbb_db_tools')) 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 // Initialize phpbb_db_tools object
@ -77,7 +77,7 @@ class phpbb_search_fulltext_sphinx
if (!class_exists('SphinxClient')) 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 // Initialize sphinx client
@ -151,7 +151,7 @@ class phpbb_search_fulltext_sphinx
return false; 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, /* Now that we're sure everything was entered correctly,
generate a config for the index. We use a config value generate a config for the index. We use a config value