mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/phpbb/db/migration/data/v310/style_update_p1.php
This commit is contained in:
Marc Alexander 2015-05-22 11:51:25 +02:00
commit 6337407192
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
View File

@ -62,8 +62,6 @@ class style_update_p1 extends \phpbb\db\migration\migration
public function styles_update() public function styles_update()
{ {
global $config;
// Get list of valid 3.1 styles // Get list of valid 3.1 styles
$available_styles = array('prosilver'); $available_styles = array('prosilver');
@ -138,7 +136,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
if (!sizeof($valid_styles)) if (!sizeof($valid_styles))
{ {
// No valid styles: remove everything and add prosilver // No valid styles: remove everything and add prosilver
$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary); $this->sql_query('DELETE FROM ' . STYLES_TABLE);
$sql_ary = array( $sql_ary = array(
'style_name' => 'prosilver', 'style_name' => 'prosilver',
@ -159,13 +157,13 @@ class style_update_p1 extends \phpbb\db\migration\migration
$this->sql_query($sql); $this->sql_query($sql);
$sql = 'SELECT style_id $sql = 'SELECT style_id
FROM ' . $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($result); $default_style = $this->db->sql_fetchfield($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$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 = 0';
$this->sql_query($sql); $this->sql_query($sql);