diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-18 21:07:41 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-12-18 21:07:41 +0100 |
| commit | 304750a88b5a1c20cbfebbe97f71c65cd464d374 (patch) | |
| tree | 61d78cfa7650aab84f351c205db457a9d7bb11f8 | |
| parent | a2407ce978a5b65deec7be9e701be26ffb367bfd (diff) | |
| download | forums-304750a88b5a1c20cbfebbe97f71c65cd464d374.tar forums-304750a88b5a1c20cbfebbe97f71c65cd464d374.tar.gz forums-304750a88b5a1c20cbfebbe97f71c65cd464d374.tar.bz2 forums-304750a88b5a1c20cbfebbe97f71c65cd464d374.tar.xz forums-304750a88b5a1c20cbfebbe97f71c65cd464d374.zip | |
[ticket/15911] Resolve warnings when updating from 3.0.0 to latest
PHPBB3-15911
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/method/email.php | 2 |
2 files changed, 6 insertions, 3 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..8838c55620 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,12 @@ 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, diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index 56dd1e9367..6376d13dc7 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -65,7 +65,7 @@ class email extends \phpbb\notification\method\messenger_base */ public function is_available(type_interface $notification_type = null) { - return parent::is_available($notification_type) && $this->config['email_enable'] && $this->user->data['user_email']; + return parent::is_available($notification_type) && $this->config['email_enable'] && !empty($this->user->data['user_email']); } /** |