aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-12-19 19:57:57 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-12-19 19:57:57 +0100
commit2a72b9b3ecf47947ddaf32564ec5810f37dd621a (patch)
treee559c699751e6f1aee92f0ae7f5015e356e9e31c /phpBB/phpbb/db/migration
parent5a21f7eb975666ba07d9cf25371f8c159e483d23 (diff)
parent68489b2c135a1ec75d142851e82ee9683f8177db (diff)
downloadforums-2a72b9b3ecf47947ddaf32564ec5810f37dd621a.tar
forums-2a72b9b3ecf47947ddaf32564ec5810f37dd621a.tar.gz
forums-2a72b9b3ecf47947ddaf32564ec5810f37dd621a.tar.bz2
forums-2a72b9b3ecf47947ddaf32564ec5810f37dd621a.tar.xz
forums-2a72b9b3ecf47947ddaf32564ec5810f37dd621a.zip
Merge pull request #5483 from marc1706/ticket/15911
[ticket/15911] Prevent errors when trying to delete from non-existent tables
Diffstat (limited to 'phpBB/phpbb/db/migration')
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php
index c018adab46..836cb4577a 100644
--- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php
@@ -58,9 +58,14 @@ class release_3_0_8_rc1 extends \phpbb\db\migration\migration
$result = $this->db->sql_query($sql);
$extension_groups_updated = array();
- while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
+ while ($row = $this->db->sql_fetchrow($result))
{
- $lang_dir = basename($lang_dir);
+ if (empty($row['lang_dir']))
+ {
+ continue;
+ }
+
+ $lang_dir = basename($row['lang_dir']);
// The language strings we need are either in language/.../acp/attachments.php
// in the update package if we're updating to 3.0.8-RC1 or later,