diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-22 11:51:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-22 11:51:25 +0200 |
| commit | 633740719218b72bac45bbcdff64def8da483851 (patch) | |
| tree | f899078be61d9ea3fe39a1a3768c58677e026430 | |
| parent | 466b71023524960e791291f3a7abe9c99af25daa (diff) | |
| parent | 5ca77df0844954390c08ebaee2c843c8cd03df88 (diff) | |
| download | forums-633740719218b72bac45bbcdff64def8da483851.tar forums-633740719218b72bac45bbcdff64def8da483851.tar.gz forums-633740719218b72bac45bbcdff64def8da483851.tar.bz2 forums-633740719218b72bac45bbcdff64def8da483851.tar.xz forums-633740719218b72bac45bbcdff64def8da483851.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/style_update_p1.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p1.php b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php index 918a565e06..3b0d53d803 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p1.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php @@ -62,8 +62,6 @@ class style_update_p1 extends \phpbb\db\migration\migration public function styles_update() { - global $config; - // Get list of valid 3.1 styles $available_styles = array('prosilver'); @@ -138,7 +136,7 @@ class style_update_p1 extends \phpbb\db\migration\migration if (!sizeof($valid_styles)) { // 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( 'style_name' => 'prosilver', @@ -159,13 +157,13 @@ class style_update_p1 extends \phpbb\db\migration\migration $this->sql_query($sql); $sql = 'SELECT style_id - FROM ' . $table . " + FROM ' . STYLES_TABLE . " WHERE style_name = 'prosilver'"; $result = $this->sql_query($sql); $default_style = $this->db->sql_fetchfield($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'; $this->sql_query($sql); |