diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2011-02-27 17:53:49 +0200 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2011-02-27 17:53:49 +0200 |
| commit | 5a966e40831da1d113b126dafb9a2112b637211b (patch) | |
| tree | 3a3aeb54e4055a07c710bd3f48f2e51290f6c6f0 | |
| parent | 00772aaa62e6bce14e58e163ea72f386136c731d (diff) | |
| parent | 3e80fe9228bcbfa01bf87da67a47cd3f284dff01 (diff) | |
Merge remote-tracking branch 'gallery3/master'
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | lib/gallery.dialog.js | 4 | ||||
| -rw-r--r-- | lib/gallery.panel.js | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/upgrade_checker.php | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.build_number b/.build_number index ba31e80f..64f75ee2 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=64 +build_number=66 diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index ec187186..087b00ab 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -48,7 +48,7 @@ var content = ""; if (mimeType[1] == "application/json") { data = JSON.parse(data); - content = unescape(data.html); + content = data.html; } else { content = data; } @@ -160,7 +160,7 @@ } if (data.html) { - $("#g-dialog").html(unescape(data.html)); + $("#g-dialog").html(data.html); $("#g-dialog").dialog("option", "position", "center"); $("#g-dialog form :submit").removeClass("ui-state-disabled") .attr("disabled", null); diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js index e0605ca3..0683c531 100644 --- a/lib/gallery.panel.js +++ b/lib/gallery.panel.js @@ -48,7 +48,7 @@ var content = ""; if (mimeType[1] == "application/json") { data = JSON.parse(data); - content = unescape(data.html); + content = data.html; } else { content = data; } diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php index ff65608b..c11a9319 100644 --- a/modules/gallery/helpers/upgrade_checker.php +++ b/modules/gallery/helpers/upgrade_checker.php @@ -42,7 +42,8 @@ class upgrade_checker_Core { static function should_auto_check() { if (upgrade_checker::auto_check_enabled() && random::int(1, 100) == 1) { $version_info = upgrade_checker::version_info(); - return (!$version_info || (time() - $version_info->timestamp) > AUTO_CHECK_INTERVAL); + return (!$version_info || + (time() - $version_info->timestamp) > upgrade_checker::AUTO_CHECK_INTERVAL); } return false; } |