diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-30 00:12:52 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-30 00:12:52 +0100 |
| commit | 01fb5532cf27090ee04a8ad4f14bc712dc2f115b (patch) | |
| tree | a684cc64a9dd5fa4f9205badad60af3b90199516 | |
| parent | 9dfb059e2ebd7413051a05687b08d7af886ab885 (diff) | |
| parent | 90f5e4e2b12f933b4816b01ab5091107766f49f0 (diff) | |
| download | forums-01fb5532cf27090ee04a8ad4f14bc712dc2f115b.tar forums-01fb5532cf27090ee04a8ad4f14bc712dc2f115b.tar.gz forums-01fb5532cf27090ee04a8ad4f14bc712dc2f115b.tar.bz2 forums-01fb5532cf27090ee04a8ad4f14bc712dc2f115b.tar.xz forums-01fb5532cf27090ee04a8ad4f14bc712dc2f115b.zip | |
Merge branch 'ticket/nickvergessen/9989' into develop-olympus
* ticket/nickvergessen/9989:
[ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| -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) |