mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00
Code Issues Releases Wiki Activity

[ticket/16345] Small improvements

Browse Source 
PHPBB3-16346
This commit is contained in:
rubencm
2020-06-07 02:15:35 +00:00
parent 3cceeb45bf
commit 774c609c4a
284 changed files with 1380 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/profilefields/manager.php
View File

@@ -39,9 +39,6 @@ class manager
/** @var \phpbb\log\log */
protected $log;
/** @var \phpbb\request\request */
protected $request;
/** @var \phpbb\template\template */
protected $template;
@@ -76,7 +73,6 @@ class manager
* @param \phpbb\event\dispatcher_interface $dispatcher Event dispatcher object
* @param \phpbb\language\language $language Language object
* @param \phpbb\log\log $log Log object
* @param \phpbb\request\request $request Request object
* @param \phpbb\template\template $template Template object
* @param \phpbb\di\service_collection $type_collection CPF Type collection
* @param \phpbb\user $user User object
@@ -93,7 +89,6 @@ class manager
\phpbb\event\dispatcher_interface $dispatcher,
\phpbb\language\language $language,
\phpbb\log\log $log,
\phpbb\request\request $request,
\phpbb\template\template $template,
\phpbb\di\service_collection $type_collection,
\phpbb\user $user,
@@ -110,7 +105,6 @@ class manager
$this->dispatcher = $dispatcher;
$this->language = $language;
$this->log = $log;
$this->request = $request;
$this->template = $template;
$this->type_collection = $type_collection;
$this->user = $user;
@@ -155,7 +149,7 @@ class manager
}
$sql = 'SELECT l.*, f.*
FROM ' . $this->fields_lang_table . ' l,
FROM ' . $this->fields_lang_table . ' l,
' . $this->fields_table . ' f
WHERE l.field_id = f.field_id
AND f.field_active = 1
@@ -192,7 +186,7 @@ class manager
$sql_where = !$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_') ? ' AND f.field_hide = 0' : '';
$sql = 'SELECT l.*, f.*
FROM ' . $this->fields_lang_table . ' l,
FROM ' . $this->fields_lang_table . ' l,
' . $this->fields_table . ' f
WHERE l.field_id = f.field_id
AND f.field_active = 1
@@ -241,7 +235,7 @@ class manager
}
$sql = 'SELECT l.*, f.*
FROM ' . $this->fields_lang_table . ' l,
FROM ' . $this->fields_lang_table . ' l,
' . $this->fields_table . ' f
WHERE l.field_id = f.field_id
AND f.field_active = 1
@@ -535,7 +529,7 @@ class manager
$length = strlen($prefix);
$not_in = [];
foreach ($cp_data as $key => $null)
foreach (array_keys($cp_data) as $key)
{
$not_in[] = strncmp($key, $prefix, $length) === 0 ? substr($key, $length) : $key;
}