aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-09-16 23:03:00 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-09-16 23:03:00 -0500
commit661dd09d6f44b46e5a30b37bb3425058f055ea01 (patch)
tree26390f533d57b15745c03414c72393659f88dbea
parenta4ec7e2aea8a47fff9d7effa76a3d07a2dd6a305 (diff)
downloadforums-661dd09d6f44b46e5a30b37bb3425058f055ea01.tar
forums-661dd09d6f44b46e5a30b37bb3425058f055ea01.tar.gz
forums-661dd09d6f44b46e5a30b37bb3425058f055ea01.tar.bz2
forums-661dd09d6f44b46e5a30b37bb3425058f055ea01.tar.xz
forums-661dd09d6f44b46e5a30b37bb3425058f055ea01.zip
[ticket/11103] Bug fix
PHPBB3-11103
-rw-r--r--phpBB/includes/functions_admin.php2
-rw-r--r--phpBB/language/en/email/notifications/topic_in_queue.txt2
-rw-r--r--phpBB/styles/prosilver/theme/common.css1
3 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 55e539cb37..27128aafac 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -718,7 +718,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
// Delete notifications
$phpbb_notifications = $phpbb_container->get('notifications');
- $phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue')), $topic_ids);
+ $phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue'), $topic_ids);
return $return;
}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index 17c8b15880..e1ff486ac5 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
Hello {USERNAME},
-You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+You are receiving this notification because the topic, "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
If you want to view the topic, click the following link:
{U_VIEW_TOPIC}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a1c71fe228..d459c6e559 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -669,7 +669,6 @@ p.rules a {
#notification_list ul li img {
float: left;
padding: 0 10px 10px 0;
-
max-width: 50px;
max-height: 50px;
}