From e5151b0fc62c054f71ebe530070420bb6ff463c1 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 14 Jun 2007 15:24:09 +0000 Subject: [PATCH] *grumble* git-svn-id: file:///svn/phpbb/trunk@7756 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_user.php | 2 +- phpBB/includes/session.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/index.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 08ccfa030f..50e84fca84 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2172,7 +2172,7 @@ function avatar_process_user(&$error, $custom_userdata = false) $sql_ary['user_avatar'] = ''; $sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0; } - elseif (!empty($userdata['user_avatar'])) + else if (!empty($userdata['user_avatar'])) { // Only update the dimensions diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 4f1732f30c..54f0167ab2 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1520,7 +1520,7 @@ class user extends session $this->data['session_viewonline'] = 1; } } - elseif (!$this->data['user_allow_viewonline']) + else if (!$this->data['user_allow_viewonline']) { // the user wants to hide and is allowed to -> cloaking device on. if ($auth->acl_get('u_hideonline')) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 64e4c5726e..0e14757885 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -187,7 +187,7 @@ if (!$get_info) $src_db->sql_freeresult($result); } - elseif ($result) + else if ($result) { $src_db->sql_freeresult($result); } diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 5a1b997b73..101ea8e0c6 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -113,11 +113,11 @@ if (!empty($mem_limit )) { $mem_limit = floor($mem_limit/1024); } - elseif ($unit == 'g') + else if ($unit == 'g') { $mem_limit *= 1024; } - elseif (is_numeric($unit)) + else if (is_numeric($unit)) { $mem_limit = floor($mem_limit/1048576); }