diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-01-29 16:13:36 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-01-29 16:13:36 +0100 |
| commit | 90f5e4e2b12f933b4816b01ab5091107766f49f0 (patch) | |
| tree | 0942cccfeca135640cdc502e325353c37a32ca6e | |
| parent | afc856417f89114d7ea56eb0b290f7604dba0d6b (diff) | |
| download | forums-90f5e4e2b12f933b4816b01ab5091107766f49f0.tar forums-90f5e4e2b12f933b4816b01ab5091107766f49f0.tar.gz forums-90f5e4e2b12f933b4816b01ab5091107766f49f0.tar.bz2 forums-90f5e4e2b12f933b4816b01ab5091107766f49f0.tar.xz forums-90f5e4e2b12f933b4816b01ab5091107766f49f0.zip | |
[ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
PHPBB3-9989
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 9 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 7 |
2 files changed, 5 insertions, 11 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index e537aabf56..009b514e52 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -46,12 +46,9 @@ var onload_functions = new Array(); var onunload_functions = new Array(); - <!-- IF S_USER_PM_POPUP --> - if ({S_NEW_PM}) - { - var url = '{UA_POPUP_PM}'; - window.open(url.replace(/&/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400'); - } + <!-- IF S_USER_PM_POPUP and S_NEW_PM --> + var url = '{UA_POPUP_PM}'; + window.open(url.replace(/&/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400'); <!-- ENDIF --> /** diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 48f6202c4f..be4c7b5b4c 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -28,11 +28,8 @@ <script type="text/javascript"> // <![CDATA[ -<!-- IF S_USER_PM_POPUP --> - if ({S_NEW_PM}) - { - popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg'); - } +<!-- IF S_USER_PM_POPUP and S_NEW_PM --> + popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg'); <!-- ENDIF --> function popup(url, width, height, name) |