makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/nickvergessen/9989' into develop-olympus

Browse source 
* ticket/nickvergessen/9989:
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
This commit is contained in:
Andreas Fischer 2011-01-30 00:12:52 +01:00
commit 01fb5532cf
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/styles/prosilver/template/overall_header.html
View file

@ -46,12 +46,9 @@
var onload_functions = new Array(); var onload_functions = new Array();
var onunload_functions = new Array(); var onunload_functions = new Array();
<!-- IF S_USER_PM_POPUP --> <!-- IF S_USER_PM_POPUP and S_NEW_PM -->
if ({S_NEW_PM}) var url = '{UA_POPUP_PM}';
{ window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
var url = '{UA_POPUP_PM}';
window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
}
<!-- ENDIF --> <!-- ENDIF -->
/** /**

7
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -28,11 +28,8 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
<!-- IF S_USER_PM_POPUP --> <!-- IF S_USER_PM_POPUP and S_NEW_PM -->
if ({S_NEW_PM}) popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
{
popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
}
<!-- ENDIF --> <!-- ENDIF -->
function popup(url, width, height, name) function popup(url, width, height, name)