4 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a98e1f7af3..38c72ad755 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -518,7 +518,7 @@ class phpbb_notification_manager
 
 			$class = $this->get_item_type_class($class_name);
 
-			if ($class->is_available() && method_exists($class_name, 'get_item_type'))
+			if ($class instanceof phpbb_notification_type_interface && $class->is_available() && method_exists($class_name, 'get_item_type'))
 			{
 				$options = array_merge(array(
 					'id'		=> $class_name::get_item_type(),
@@ -556,7 +556,7 @@ class phpbb_notification_manager
 
 			$method = $this->get_method_class($class_name);
 
-			if ($method->is_available())
+			if ($method instanceof phpbb_notification_method_interface && $method->is_available())
 			{
 				$subscription_methods[] = $method_name;
 			}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 863feb576b..bf1f4edeea 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -736,4 +736,4 @@ p.rules a {
 
 .notification_list ul.topiclist dt {
 	width: 88%;
-}
-\ No newline at end of file
+}
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 210159732e..11989feca6 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -15,6 +15,8 @@
 <script type="text/javascript">
 // <![CDATA[
 <!-- IF S_NOTIFICATIONS_DISPLAY -->
+(function($) {  // Avoid conflicts with other libraries
+
 $(document).click(function(e) {
     var target = e.target;
 
@@ -22,6 +24,8 @@ $(document).click(function(e) {
         $('#notification_list').hide();
     }
 });
+
+})(jQuery); // Avoid conflicts with other libraries
 <!-- ENDIF -->
 // ]]>
 </script>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index b41860d130..c411edd367 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1182,4 +1182,4 @@ a.imageset {
 
 #notification_list .footer > a {
 	display: block;
-}
-\ No newline at end of file
+}