mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
  [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 01:17:06 +01:00
parent 85e0ae7eae c3a4312650
commit bafe3d9484
3 changed files with 7 additions and 13 deletions
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 onunload_functions = new Array();
<!-- IF S_USER_PM_POPUP -->
if ({S_NEW_PM})
{
var url = '{UA_POPUP_PM}';
window.open(url.replace(/&amp;/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(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
<!-- ENDIF -->
/**

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

@@ -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)