aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-24 00:20:51 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-24 00:20:51 +0200
commitc2f19239a11d206368ae2a35a115c5a803ed283e (patch)
tree8da83b1de911b11d60a37c5b873295a7b2a12246 /phpBB/phpbb
parent05616b6cebec812218f35a23ccf6c7823a74732e (diff)
parente2c56609ab275e45bbcb38a213c530ccd41ceff6 (diff)
downloadforums-c2f19239a11d206368ae2a35a115c5a803ed283e.tar
forums-c2f19239a11d206368ae2a35a115c5a803ed283e.tar.gz
forums-c2f19239a11d206368ae2a35a115c5a803ed283e.tar.bz2
forums-c2f19239a11d206368ae2a35a115c5a803ed283e.tar.xz
forums-c2f19239a11d206368ae2a35a115c5a803ed283e.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php b/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
index 30168f4b0b..f749b32119 100644
--- a/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
+++ b/phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
@@ -85,6 +85,11 @@ class notifications_use_full_name extends \phpbb\db\migration\migration
public function update_notifications_name()
{
+ $sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . '
+ SET notification_type_enabled = 0
+ WHERE ' . $this->db->sql_in_set('notification_type_name', $this->notification_types, true);
+ $this->db->sql_query($sql);
+
foreach ($this->notification_types as $notification_type)
{
$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . "