aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-16 18:14:06 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-16 18:14:06 -0500
commit0d098ae5e5768e6ceb21a65f350f521ebe3c1908 (patch)
tree7e6431c73cda58e2b63817d2dd5f80f5273afc85
parent92b533aad381ae1da8ccb1cd33fa19f31d8a0e98 (diff)
downloadforums-0d098ae5e5768e6ceb21a65f350f521ebe3c1908.tar
forums-0d098ae5e5768e6ceb21a65f350f521ebe3c1908.tar.gz
forums-0d098ae5e5768e6ceb21a65f350f521ebe3c1908.tar.bz2
forums-0d098ae5e5768e6ceb21a65f350f521ebe3c1908.tar.xz
forums-0d098ae5e5768e6ceb21a65f350f521ebe3c1908.zip
[ticket/11103] Return false to prevent appending # to the URL
PHPBB3-11103
-rw-r--r--phpBB/styles/prosilver/template/ajax.js1
-rw-r--r--phpBB/styles/subsilver2/template/overall_header.html2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index f4519bf7aa..3c5e1a1c12 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -79,6 +79,7 @@ $('#qr_full_editor').click(function() {
// Toggle notification list
$('#notification_list_button').click(function() {
$('#notification_list').toggle();
+ return false;
});
$('#phpbb').click(function(e) {
var target = e.target;
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 069c39aaae..aec754c444 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -150,7 +150,7 @@ function marklist(id, name, state)
<tr>
<td class="genmed">
<!-- IF S_NOTIFICATIONS_DISPLAY -->
- [ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle();">{NOTIFICATIONS_COUNT}</a> ] &bull;
+ [ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}" onclick="$('#notification_list').toggle(); return false;">{NOTIFICATIONS_COUNT}</a> ] &bull;
<div id="notification_list" class="notification_list">
<div class="row1 header">
{L_NOTIFICATIONS}