diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:20 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:20 +0200 |
| commit | 53ff23671c2706c13bbe8ecca6b29b3c3456768b (patch) | |
| tree | 9c53dc59698da5b4750e536f20552ffe088931c3 /phpBB/phpbb/search/fulltext_postgres.php | |
| parent | 86e21a9b261d6239487c626b7e9c9f462ceab611 (diff) | |
| parent | ff6e026a403a622bd1aa498bff396a737735faed (diff) | |
| download | forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.gz forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.bz2 forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.xz forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.zip | |
Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
Diffstat (limited to 'phpBB/phpbb/search/fulltext_postgres.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_postgres.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php index bdb5a86009..02e0870fd2 100644 --- a/phpBB/phpbb/search/fulltext_postgres.php +++ b/phpBB/phpbb/search/fulltext_postgres.php @@ -107,7 +107,7 @@ class fulltext_postgres extends \phpbb\search\base $this->word_length = array('min' => $this->config['fulltext_postgres_min_word_len'], 'max' => $this->config['fulltext_postgres_max_word_len']); - if ($this->db->sql_layer == 'postgres') + if ($this->db->get_sql_layer() == 'postgres') { $pgsql_version = explode(',', substr($this->db->sql_server_info(), 10)); $this->version = trim($pgsql_version[0]); @@ -185,7 +185,7 @@ class fulltext_postgres extends \phpbb\search\base */ public function init() { - if ($this->db->sql_layer != 'postgres') + if ($this->db->get_sql_layer() != 'postgres') { return $this->user->lang['FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE']; } @@ -869,7 +869,7 @@ class fulltext_postgres extends \phpbb\search\base */ protected function get_stats() { - if ($this->db->sql_layer != 'postgres') + if ($this->db->get_sql_layer() != 'postgres') { $this->stats = array(); return; @@ -919,7 +919,7 @@ class fulltext_postgres extends \phpbb\search\base <dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt> <dd><select name="config[fulltext_postgres_ts_name]">'; - if ($this->db->sql_layer == 'postgres' && $this->tsearch_usable) + if ($this->db->get_sql_layer() == 'postgres' && $this->tsearch_usable) { $sql = 'SELECT cfgname AS ts_name FROM pg_ts_config'; |