From 8437a85ac87f8fc6b4ee420bde59eda683140063 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 29 Jan 2011 08:37:12 -0800 Subject: AUTO_CHECK_INTERVAL --> upgrade_checker::AUTO_CHECK_INTERVAL Fixes #1624 --- modules/gallery/helpers/upgrade_checker.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3 From 8ecbd5b32f4ee5217f844b1a046bc0e36bb21e21 Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Thu, 24 Feb 2011 23:47:45 -0700 Subject: Automated update of .build_number to 65 for branch master Last update: d2c77fd0590501f7b6b51d9f4cc033ed9485b082 (1 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_number b/.build_number index ba31e80f..da075214 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=65 -- cgit v1.2.3 From 443e49b2ae88545f5a56842f2283f4f98dc7b65f Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 24 Feb 2011 22:52:32 -0800 Subject: Revert overeager escaping introduced in https://github.com/gallery/gallery3/commit/bb35aefffbc287efc9823abd4b0e451b86c37378 in an attempt to resolve #797. Fixes #1640. --- lib/gallery.dialog.js | 4 ++-- lib/gallery.panel.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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; } -- cgit v1.2.3 From 3e80fe9228bcbfa01bf87da67a47cd3f284dff01 Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Fri, 25 Feb 2011 00:02:57 -0700 Subject: Automated update of .build_number to 66 for branch master Last update: d2c77fd0590501f7b6b51d9f4cc033ed9485b082 (3 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_number b/.build_number index da075214..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=65 +build_number=66 -- cgit v1.2.3