diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-25 15:52:38 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-25 15:52:38 +0100 |
| commit | cb406258fe13f593035f0cd29e5835752985629c (patch) | |
| tree | 98c5670464f8a99a70f7fc3a4dc71e8138c8cede /phpBB/phpbb | |
| parent | 27cf12f8070a34582781aecfabcc16689b0cb50a (diff) | |
| parent | 97a0f49be42085a91ae3693c70f9c8d3496c1577 (diff) | |
| download | forums-cb406258fe13f593035f0cd29e5835752985629c.tar forums-cb406258fe13f593035f0cd29e5835752985629c.tar.gz forums-cb406258fe13f593035f0cd29e5835752985629c.tar.bz2 forums-cb406258fe13f593035f0cd29e5835752985629c.tar.xz forums-cb406258fe13f593035f0cd29e5835752985629c.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/profilefield_base_migration.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php index 2d4d26ae61..d43d432dd9 100644 --- a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php +++ b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php @@ -52,6 +52,7 @@ class notification_options_reconvert extends \phpbb\db\migration\migration { $limit = 250; $converted_users = 0; + $start = $start ?: 0; $sql = 'SELECT user_id, user_notify_type, user_notify_pm FROM ' . $this->table_prefix . 'users diff --git a/phpBB/phpbb/db/migration/profilefield_base_migration.php b/phpBB/phpbb/db/migration/profilefield_base_migration.php index 3f26a4998c..bc542a8fed 100644 --- a/phpBB/phpbb/db/migration/profilefield_base_migration.php +++ b/phpBB/phpbb/db/migration/profilefield_base_migration.php @@ -191,6 +191,7 @@ abstract class profilefield_base_migration extends container_aware_migration $insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $this->table_prefix . 'profile_fields_data'); $limit = 250; $converted_users = 0; + $start = $start ?: 0; $sql = 'SELECT user_id, ' . $this->user_column_name . ' FROM ' . $this->table_prefix . 'users |