From 46272ffb934c774e1136da0d55ee4596560b9eaa Mon Sep 17 00:00:00 2001 From: colymba Date: Tue, 22 Oct 2013 12:01:24 +0300 Subject: [PATCH 1/2] image cacheFilename checks for numeric strings using JSON_NUMERIC_CHECK json_encode flag and avoid duplicate files creation --- model/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/Image.php b/model/Image.php index 5c8f3e098..50f5240a0 100644 --- a/model/Image.php +++ b/model/Image.php @@ -442,7 +442,7 @@ class Image extends File { array_shift($args); $folder = $this->ParentID ? $this->Parent()->Filename : ASSETS_DIR . "/"; - $format = $format . base64_encode(json_encode($args)); + $format = $format . base64_encode(json_encode($args, JSON_NUMERIC_CHECK)); $filename = $format . "-" . $this->Name; $patterns = $this->getFilenamePatterns($this->Name); if (!preg_match($patterns['FullPattern'], $filename)) { From f89f203392cdf8e8391de4c619c5eeade8c83b75 Mon Sep 17 00:00:00 2001 From: colymba Date: Wed, 23 Oct 2013 11:10:42 +0300 Subject: [PATCH 2/2] Raised minimum PHP Veresion to 5.3.3 --- composer.json | 2 +- dev/install/install.php | 6 +++--- dev/install/install.php5 | 4 ++-- dev/install/php5-required.html | 8 ++++---- docs/en/changelogs/3.2.0.md | 9 +++++++++ docs/en/installation/server-requirements.md | 2 +- docs/en/installation/windows-manual-iis-7.md | 2 +- main.php | 4 ++-- 8 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 docs/en/changelogs/3.2.0.md diff --git a/composer.json b/composer.json index a38fdb952..1ee62e382 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=5.3.2", + "php": ">=5.3.3", "composer/installers": "*" }, "extra": { diff --git a/dev/install/install.php b/dev/install/install.php index 703bf97e1..fb1a35655 100644 --- a/dev/install/install.php +++ b/dev/install/install.php @@ -4,17 +4,17 @@ ************************************************************************************ ** ** ** If you can read this text in your browser then you don't have PHP installed. ** - ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. ** + ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. ** ** ** ************************************************************************************ ************************************************************************************/ /** - * PHP version check. Make sure we've got at least PHP 5.3.2 in the most friendly way possible + * PHP version check. Make sure we've got at least PHP 5.3.3 in the most friendly way possible */ define('FRAMEWORK_NAME', 'framework'); -if (version_compare(phpversion(), '5.3.2', '<')) { +if (version_compare(phpversion(), '5.3.3', '<')) { header("HTTP/1.1 500 Server Error"); echo str_replace( array('$PHPVersion', 'sapphire'), diff --git a/dev/install/install.php5 b/dev/install/install.php5 index b05808276..02cf81343 100755 --- a/dev/install/install.php5 +++ b/dev/install/install.php5 @@ -4,7 +4,7 @@ ************************************************************************************ ** ** ** If you can read this text in your browser then you don't have PHP installed. ** - ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. ** + ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. ** ** ** ************************************************************************************ ************************************************************************************/ @@ -411,7 +411,7 @@ class InstallRequirements { $isIIS = $this->isIIS(7); $webserver = $this->findWebserver(); - $this->requirePHPVersion('5.3.4', '5.3.2', array( + $this->requirePHPVersion('5.3.4', '5.3.3', array( "PHP Configuration", "PHP5 installed", null, diff --git a/dev/install/php5-required.html b/dev/install/php5-required.html index 8db360a21..c151b77d9 100644 --- a/dev/install/php5-required.html +++ b/dev/install/php5-required.html @@ -1,18 +1,18 @@ - PHP 5.3.2 is required + PHP 5.3.3 is required