mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-25 02:51:35 +02:00
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.
This commit is contained in:
@@ -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 -->
|
||||
|
||||
/**
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user