makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 17:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15911] Resolve warnings when updating from 3.0.0 to latest

Browse source 
PHPBB3-15911
This commit is contained in:
Marc Alexander 2018-12-18 21:07:41 +01:00
parent a2407ce978
commit 304750a88b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/db/migration/data/v30x/release_3_0_8_rc1.php
View file

@ -58,9 +58,12 @@ class release_3_0_8_rc1 extends \phpbb\db\migration\migration
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$extension_groups_updated = array(); $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 // 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, // in the update package if we're updating to 3.0.8-RC1 or later,

2
phpBB/phpbb/notification/method/email.php
View file

@ -65,7 +65,7 @@ class email extends \phpbb\notification\method\messenger_base
*/ */
public function is_available(type_interface $notification_type = null) 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']);
} }
/** /**