Permalink
Browse files

[ticket/10561] Reverted to phpbb_style_is_active()

Changes made to function name, reverted to old.

PHPBB3-10561
  • Loading branch information...
1 parent 1808a61 commit 03a35581c4b0dcb7c20885d4ca807ea7117872cb Hari Sankar R committed Apr 7, 2012
Showing with 6 additions and 5 deletions.
  1. +1 −1 phpBB/includes/functions_user.php
  2. +2 −2 phpBB/includes/ucp/ucp_prefs.php
  3. +3 −2 phpBB/install/database_update.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;
@@ -65,9 +65,9 @@ function main($id, $mode)
{
$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(
@@ -2030,25 +2030,26 @@ 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 . '
SET user_style = ' . $config['default_style'] .'
WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
$result = $db->sql_query($sql);
}
+
$no_updates = false;
break;
}

0 comments on commit 03a3558

Please sign in to comment.