diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 22:24:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 22:24:59 +0200 |
| commit | 4d6afb26380d192efc556640499b6f5c43fbdf3c (patch) | |
| tree | 4517a02476b14ffcd3f51e8aa62634292ab28f32 /phpBB/includes/acp | |
| parent | 0b106ab0e3f9fe94e42a55db27d1d989c06b5039 (diff) | |
| parent | ca3cdadd083dfa2e4e0596d17424c7d9b541785c (diff) | |
| download | forums-4d6afb26380d192efc556640499b6f5c43fbdf3c.tar forums-4d6afb26380d192efc556640499b6f5c43fbdf3c.tar.gz forums-4d6afb26380d192efc556640499b6f5c43fbdf3c.tar.bz2 forums-4d6afb26380d192efc556640499b6f5c43fbdf3c.tar.xz forums-4d6afb26380d192efc556640499b6f5c43fbdf3c.zip | |
Merge pull request #2604 from Nicofuma/ticket/12722
[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
* Nicofuma/ticket/12722:
[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_jabber.php | 14 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 5b88035fa4..8d2e9d41a3 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -47,13 +47,13 @@ class acp_jabber $this->tpl_name = 'acp_jabber'; $this->page_title = 'ACP_JABBER_SETTINGS'; - $jab_enable = request_var('jab_enable', (bool) $config['jab_enable']); - $jab_host = request_var('jab_host', (string) $config['jab_host']); - $jab_port = request_var('jab_port', (int) $config['jab_port']); - $jab_username = request_var('jab_username', (string) $config['jab_username']); - $jab_password = request_var('jab_password', (string) $config['jab_password']); - $jab_package_size = request_var('jab_package_size', (int) $config['jab_package_size']); - $jab_use_ssl = request_var('jab_use_ssl', (bool) $config['jab_use_ssl']); + $jab_enable = request_var('jab_enable', (bool) $config['jab_enable']); + $jab_host = request_var('jab_host', (string) $config['jab_host']); + $jab_port = request_var('jab_port', (int) $config['jab_port']); + $jab_username = request_var('jab_username', (string) $config['jab_username']); + $jab_password = request_var('jab_password', (string) $config['jab_password']); + $jab_package_size = request_var('jab_package_size', (int) $config['jab_package_size']); + $jab_use_ssl = request_var('jab_use_ssl', (bool) $config['jab_use_ssl']); $form_name = 'acp_jabber'; add_form_key($form_name); diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 8fa9dba57b..7bb8e824d6 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -835,7 +835,7 @@ class auth_admin extends \phpbb\auth\auth } // Remove current auth options... - $auth_option_ids = array((int)$any_option_id); + $auth_option_ids = array((int) $any_option_id); foreach ($auth as $auth_option => $auth_setting) { $auth_option_ids[] = (int) $this->acl_options['id'][$auth_option]; |