diff options
| author | Hari Sankar R <hsr@theinglorio.us> | 2012-04-07 23:15:12 +0530 |
|---|---|---|
| committer | Hari Sankar R <hsr@theinglorio.us> | 2012-04-07 23:15:12 +0530 |
| commit | 03a35581c4b0dcb7c20885d4ca807ea7117872cb (patch) | |
| tree | fc38d54c16d9f1d1f9f310c9fea2634fd211d0dc | |
| parent | 1808a61fe3e89399aec4ecced36e270faa7d0beb (diff) | |
| download | forums-03a35581c4b0dcb7c20885d4ca807ea7117872cb.tar forums-03a35581c4b0dcb7c20885d4ca807ea7117872cb.tar.gz forums-03a35581c4b0dcb7c20885d4ca807ea7117872cb.tar.bz2 forums-03a35581c4b0dcb7c20885d4ca807ea7117872cb.tar.xz forums-03a35581c4b0dcb7c20885d4ca807ea7117872cb.zip | |
[ticket/10561] Reverted to phpbb_style_is_active()
Changes made to function name, reverted to old.
PHPBB3-10561
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 7313844955..770eab48d5 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1952,7 +1952,7 @@ function validate_jabber($jid) * @param int $style_id The style_id of a style which should be checked if activated or not. * @return boolean */ -function phpbb_validate_style($style_id) +function phpbb_style_is_active($style_id) { global $db; diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 5b915824d6..f6fe916d8b 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -65,9 +65,9 @@ class ucp_prefs { $data['style'] = $config['default_style']; } - else if (!phpbb_validate_style($data['style'])) + else if (!phpbb_style_is_active($data['style'])) { - $data['style'] = (int) $user->data['user_style']); + $data['style'] = (int) $user->data['user_style']; } $error = validate_data($data, array( diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 096d90219b..8f00b18846 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2030,18 +2030,18 @@ function change_database_data(&$no_updates, $version) // Changes from 3.0.10 to 3.0.11-RC1 case '3.0.10': // Updates users having current style a deactivated one - $deactivated_style_ids = array(); $sql = 'SELECT style_id FROM ' . STYLES_TABLE . ' WHERE style_active = 0'; $result = $db->sql_query($sql); + $deactivated_style_ids = array(); while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result)) { $deactivated_style_ids[] = (int) $temp_style_id; } - $db->sql_freeresult($result); + if (!empty($deactivated_style_ids)) { $sql = 'UPDATE ' . USERS_TABLE . ' @@ -2049,6 +2049,7 @@ function change_database_data(&$no_updates, $version) WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids); $result = $db->sql_query($sql); } + $no_updates = false; break; } |