diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-08 15:39:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-08 15:39:47 +0200 |
| commit | 2e31cae7bfe67a38ca2832b827299b0866dd8d4e (patch) | |
| tree | 4e0463ff297466b829d2f2d48469d83f27d9c061 /phpBB/phpbb | |
| parent | 04c9520c73a0a0c61ee8331ed36f58e9904a5cb7 (diff) | |
| parent | f9389995e72e7517668542d65f088b71e1c221f6 (diff) | |
| download | forums-2e31cae7bfe67a38ca2832b827299b0866dd8d4e.tar forums-2e31cae7bfe67a38ca2832b827299b0866dd8d4e.tar.gz forums-2e31cae7bfe67a38ca2832b827299b0866dd8d4e.tar.bz2 forums-2e31cae7bfe67a38ca2832b827299b0866dd8d4e.tar.xz forums-2e31cae7bfe67a38ca2832b827299b0866dd8d4e.zip | |
Merge branch 'ticket/13930' into ticket/13930-master
Conflicts:
phpBB/includes/acp/acp_database.php
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/cache/driver/memcache.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/log/log.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php index 406ab11ddd..caa82fb0b1 100644 --- a/phpBB/phpbb/cache/driver/memcache.php +++ b/phpBB/phpbb/cache/driver/memcache.php @@ -50,7 +50,7 @@ class memcache extends \phpbb\cache\driver\memory parent::__construct(); $this->memcache = new \Memcache; - foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u) + foreach (explode(',', PHPBB_ACM_MEMCACHE) as $u) { $parts = explode('/', $u); $this->memcache->addServer(trim($parts[0]), trim($parts[1])); diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index a1bf0f8e88..1b02d98b82 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -535,7 +535,7 @@ class log implements \phpbb\log\log_interface 'ORDER_BY' => $sort_by, ); - if($log_time) + if ($log_time) { $get_logs_sql_ary['WHERE'] = 'l.log_time >= ' . (int) $log_time . ' AND ' . $get_logs_sql_ary['WHERE']; diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index a5ad96b114..fac035986d 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -139,7 +139,7 @@ class fulltext_sphinx global $phpbb_container; // TODO inject into object $this->db_tools = $phpbb_container->get('dbal.tools'); - if(!$this->config['fulltext_sphinx_id']) + if (!$this->config['fulltext_sphinx_id']) { $this->config->set('fulltext_sphinx_id', unique_id()); } |