diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-22 11:49:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-22 11:49:07 +0200 |
| commit | 5ca77df0844954390c08ebaee2c843c8cd03df88 (patch) | |
| tree | 7aef476dc1f9ef2300b44c57544881ee92ae4bb6 | |
| parent | 1d2a127144476b29ebd37a7d239520d87bd93adc (diff) | |
| parent | 67502c0d22bf8a3e45902579e99f7b1f8b74ff31 (diff) | |
| download | forums-5ca77df0844954390c08ebaee2c843c8cd03df88.tar forums-5ca77df0844954390c08ebaee2c843c8cd03df88.tar.gz forums-5ca77df0844954390c08ebaee2c843c8cd03df88.tar.bz2 forums-5ca77df0844954390c08ebaee2c843c8cd03df88.tar.xz forums-5ca77df0844954390c08ebaee2c843c8cd03df88.zip | |
Merge pull request #3624 from VSEphpbb/ticket/13861
[ticket/13861] Fix undefined variables in style update migration
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/style_update_p1.php | 6 |
1 files changed, 3 insertions, 3 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 e8d3a3af64..3b0d53d803 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p1.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p1.php @@ -136,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', @@ -157,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); - set_config('default_style', $default_style); + $this->config->set('default_style', $default_style); $sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0'; $this->sql_query($sql); |