From bd73eee3d54958d002595f6decc1a06514e4cf6e Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Sun, 22 Jul 2012 02:12:08 +0000
Subject: [PATCH] refs #3273
git-svn-id: http://dev.piwik.org/svn/trunk@6531 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
config/global.ini.php | 8 ++++----
tests/core/ReleaseCheckList.test.php | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/global.ini.php b/config/global.ini.php
index e8ec42b0a1..a5b2f79793 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -247,8 +247,8 @@ multisites_refresh_after_seconds = 300
use_ajax_cdn = 0
; required AJAX library versions
-jquery_version = 1.7.1
-jqueryui_version = 1.8.16
+jquery_version = 1.7.2
+jqueryui_version = 1.8.21
swfobject_version = 2.2
; Set to 1 if you're using https on your Piwik server and Piwik can't detect it,
@@ -519,5 +519,5 @@ Plugins_Tracker[] = DoNotTrack
SDK_batch_size = 10
SDK_interval_value = 30
-; NOTE: do not directly in this file! See notice at the top
-
\ No newline at end of file
+; NOTE: do not directly edit this file! See notice at the top
+
diff --git a/tests/core/ReleaseCheckList.test.php b/tests/core/ReleaseCheckList.test.php
index c8e0fa0ef0..df2e8ff46b 100644
--- a/tests/core/ReleaseCheckList.test.php
+++ b/tests/core/ReleaseCheckList.test.php
@@ -100,7 +100,7 @@ class Test_Piwik_ReleaseCheckList extends UnitTestCase
$this->assertEqual( $matches[1], Piwik_Config::getInstance()->General['jquery_version'] );
$jqueryuiJs = file_get_contents( PIWIK_DOCUMENT_ROOT . '/libs/jquery/jquery-ui.js', false, NULL, 0, 512 );
- $this->assertTrue( preg_match('/jQuery UI ([0-9.]+)/', $jqueryuiJs, $matches) );
+ $this->assertTrue( preg_match('/jQuery UI v?([0-9.]+)/', $jqueryuiJs, $matches) );
$this->assertEqual( $matches[1], Piwik_Config::getInstance()->General['jqueryui_version'] );
--
GitLab