aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPayBas <contact@paybas.com>2014-07-07 11:25:33 +0200
committerPayBas <contact@paybas.com>2014-07-07 11:28:06 +0200
commit0a286e044b3d7b71edea5f79213e6c008db66986 (patch)
tree37775fe8e3a6aca6c057fa2e84e4fe5d0e81dbd2
parentfbc07d3b14faf345c3bcd79204b32085e6260fb5 (diff)
downloadforums-0a286e044b3d7b71edea5f79213e6c008db66986.tar
forums-0a286e044b3d7b71edea5f79213e6c008db66986.tar.gz
forums-0a286e044b3d7b71edea5f79213e6c008db66986.tar.bz2
forums-0a286e044b3d7b71edea5f79213e6c008db66986.tar.xz
forums-0a286e044b3d7b71edea5f79213e6c008db66986.zip
[ticket/12804] Dont use ternary form
PHPBB3-12804
-rw-r--r--phpBB/includes/ucp/ucp_profile.php2
-rw-r--r--phpBB/memberlist.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 6940f18345..a315b167d7 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -394,7 +394,7 @@ class ucp_profile
$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
- 'S_JABBER_ENABLED' => ($config['jab_enable']) ? true : false,
+ 'S_JABBER_ENABLED' => $config['jab_enable'],
'JABBER' => $data['jabber'],
));
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 6337a5e633..80917a7f76 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1286,7 +1286,7 @@ switch ($mode)
'S_IP_SEARCH_ALLOWED' => ($auth->acl_getf_global('m_info')) ? true : false,
'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false,
- 'S_JABBER_ENABLED' => ($config['jab_enable']) ? true : false,
+ 'S_JABBER_ENABLED' => $config['jab_enable'],
'S_IN_SEARCH_POPUP' => ($form && $field) ? true : false,
'S_SEARCH_USER' => ($mode == 'searchuser' || ($mode == '' && $submit)),
'S_FORM_NAME' => $form,