makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-10-22 10:19:35 +02:00
commit d11db17e2c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 60 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_styles.php
View file

@ -398,7 +398,7 @@ class acp_styles
// Reset default style for users who use selected styles // Reset default style for users who use selected styles
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_style = 0 SET user_style = ' . (int) $this->default_style . '
WHERE user_style IN (' . implode(', ', $ids) . ')'; WHERE user_style IN (' . implode(', ', $ids) . ')';
$this->db->sql_query($sql); $this->db->sql_query($sql);
@ -1249,7 +1249,7 @@ class acp_styles
// Change default style for users // Change default style for users
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_style = 0 SET user_style = ' . (int) $this->default_style . '
WHERE user_style = ' . $id; WHERE user_style = ' . $id;
$this->db->sql_query($sql); $this->db->sql_query($sql);

10
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
View file

@ -160,12 +160,12 @@ class style_update_p1 extends \phpbb\db\migration\migration
FROM ' . STYLES_TABLE . " FROM ' . STYLES_TABLE . "
WHERE style_name = 'prosilver'"; WHERE style_name = 'prosilver'";
$result = $this->sql_query($sql); $result = $this->sql_query($sql);
$default_style = $this->db->sql_fetchfield('style_id'); $default_style = (int) $this->db->sql_fetchfield('style_id');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->config->set('default_style', $default_style); $this->config->set('default_style', $default_style);
$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0'; $sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = ' . (int) $default_style;
$this->sql_query($sql); $this->sql_query($sql);
} }
else else
@ -183,9 +183,9 @@ class style_update_p1 extends \phpbb\db\migration\migration
} }
// Reset styles for users // Reset styles for users
$this->sql_query('UPDATE ' . USERS_TABLE . ' $this->sql_query('UPDATE ' . USERS_TABLE . "
SET user_style = 0 SET user_style = '" . (int) $valid_styles[0] . "'
WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true)); WHERE " . $this->db->sql_in_set('user_style', $valid_styles, true));
} }
} }
} }

50
phpBB/phpbb/db/migration/data/v32x/fix_user_styles.php Normal file
View file

@ -0,0 +1,50 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v32x;
class fix_user_styles extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v320\v320',
);
}
public function update_data()
{
return array(
array('custom', array(array($this, 'styles_fix'))),
);
}
public function styles_fix()
{
$default_style = (int) $this->config['default_style'];
// Get enabled styles
$sql = 'SELECT style_id
FROM ' . STYLES_TABLE . '
WHERE style_active = 1';
$result = $this->db->sql_query($sql);
$enabled_styles = $result->fetch_array();
$this->db->sql_freeresult($result);
// Set the default style to users who have an invalid style
$this->sql_query('UPDATE ' . USERS_TABLE . '
SET user_style = ' . (int) $default_style . '
WHERE ' . $this->db->sql_in_set('user_style', $enabled_styles, true));
}
}

18
phpBB/phpbb/user.php
View file

@ -278,24 +278,6 @@ class user extends \phpbb\session
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
// User has wrong style
if (!$this->style && $style_id == $this->data['user_style'])
{
$style_id = $this->data['user_style'] = $config['default_style'];
$sql = 'UPDATE ' . USERS_TABLE . "
SET user_style = $style_id
WHERE user_id = {$this->data['user_id']}";
$db->sql_query($sql);
$sql = 'SELECT *
FROM ' . STYLES_TABLE . " s
WHERE s.style_id = $style_id";
$result = $db->sql_query($sql, 3600);
$this->style = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
}
if (!$this->style) if (!$this->style)
{ {
trigger_error('NO_STYLE_DATA', E_USER_ERROR); trigger_error('NO_STYLE_DATA', E_USER_ERROR);

3
tests/test_framework/phpbb_functional_test_case.php
View file

@ -571,6 +571,9 @@ class phpbb_functional_test_case extends phpbb_test_case
$config['rand_seed'] = ''; $config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600; $config['rand_seed_last_update'] = time() + 600;
// Prevent new user to have an invalid style
$config['default_style'] = 1;
// Required by user_add // Required by user_add
global $db, $cache, $phpbb_dispatcher, $phpbb_container; global $db, $cache, $phpbb_dispatcher, $phpbb_container;
$db = $this->get_db(); $db = $this->get_db();