diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 19:20:54 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 19:20:54 -0500 |
| commit | 2c06c2bd3646585a5b02e6269be655287352a667 (patch) | |
| tree | 4b8930d2ba2ca54ccc8b29fc4549148af20773b1 | |
| parent | f96dac335287f2fd51ff6628facbc8b6af6a517f (diff) | |
| download | forums-2c06c2bd3646585a5b02e6269be655287352a667.tar forums-2c06c2bd3646585a5b02e6269be655287352a667.tar.gz forums-2c06c2bd3646585a5b02e6269be655287352a667.tar.bz2 forums-2c06c2bd3646585a5b02e6269be655287352a667.tar.xz forums-2c06c2bd3646585a5b02e6269be655287352a667.zip | |
[ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof
PHPBB3-11103
| -rw-r--r-- | phpBB/includes/notification/manager.php | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_footer.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/theme/stylesheet.css | 2 |
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 +} |