diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-30 01:17:06 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-30 01:17:06 +0100 |
| commit | bafe3d9484037049a766fc1f9d728979d2d0483a (patch) | |
| tree | 0057079f482c25d45e896b69b3ddcd322ff182a0 | |
| parent | 85e0ae7eaebc722426a9184db9c993f7500909f5 (diff) | |
| parent | c3a43126504b5eddfa684e900d888dfcbd3dd281 (diff) | |
| download | forums-bafe3d9484037049a766fc1f9d728979d2d0483a.tar forums-bafe3d9484037049a766fc1f9d728979d2d0483a.tar.gz forums-bafe3d9484037049a766fc1f9d728979d2d0483a.tar.bz2 forums-bafe3d9484037049a766fc1f9d728979d2d0483a.tar.xz forums-bafe3d9484037049a766fc1f9d728979d2d0483a.zip | |
Merge branch 'develop-olympus' into develop
* 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.
| -rw-r--r-- | phpBB/includes/captcha/captcha_gd_wave.php | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 9 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 7 |
3 files changed, 7 insertions, 13 deletions
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php index 99d2417f91..503283d848 100644 --- a/phpBB/includes/captcha/captcha_gd_wave.php +++ b/phpBB/includes/captcha/captcha_gd_wave.php @@ -62,8 +62,8 @@ class captcha 'y' => mt_rand(10, 17) ), 'lower_left' => array( - 'x' => mt_rand($img_x - 5, $img_x - 45), - 'y' => mt_rand($img_y - 0, $img_y - 15) + 'x' => mt_rand($img_x - 45, $img_x - 5), + 'y' => mt_rand($img_y - 15, $img_y - 0), ), ); diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 6f35175fa6..ff14abe370 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 26e4b0c9a5..b9c7a604ce 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) |