tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2577 from colymba/fix-cacheFilename

Browse Source 
image cacheFilename checks for numeric strings
This commit is contained in:
Ingo Schommer 2013-10-23 01:37:00 -07:00
commit 14196fc6a3
9 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=5.3.2",
"php": ">=5.3.3",
"composer/installers": "*"
},
"extra": {

6
dev/install/install.php
View File

@ -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'),

4
dev/install/install.php5
View File

@ -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,

8
dev/install/php5-required.html
View File

@ -1,18 +1,18 @@
<html>
<head>
<title>PHP 5.3.2 is required</title>
<title>PHP 5.3.3 is required</title>
<link rel="stylesheet" type="text/css" href="framework/dev/install/css/install.css">
</head>
<body>
<div id="BgContainer">
<div id="Container">
<div id="Header">
<h1>PHP 5.3.2 required</h1>
<h1>PHP 5.3.3 required</h1>
<div class="left">
<h3>To run SilverStripe, please install PHP 5.3.2 or greater.</h3>
<h3>To run SilverStripe, please install PHP 5.3.3 or greater.</h3>
<p>We have detected that you are running PHP version <b>$PHPVersion</b>. In order to run SilverStripe,
you must have PHP version 5.3.2 or greater, and for best results we recommend PHP 5.3.4 or greater.<p/>
you must have PHP version 5.3.3 or greater, and for best results we recommend PHP 5.3.4 or greater.<p/>
<p>If you are running on a shared host, you may need to ask your hosting provider how to do this.</p>
</div>

9
docs/en/changelogs/3.2.0.md Normal file
View File

@ -0,0 +1,9 @@
# 3.2.0 (unreleased)
## Overview
* Minimum PHP version raised to 5.3.3
## Changelog
### Bugfixes

2
docs/en/installation/server-requirements.md
View File

@ -8,7 +8,7 @@ Our web-based [PHP installer](/installation) can check if you meet the requireme
## Web server software requirements
* PHP 5.3.2+
* PHP 5.3.3+
* We recommend using a PHP accelerator or opcode cache, such as [xcache](http://xcache.lighttpd.net/) or [WinCache](http://www.iis.net/download/wincacheforphp).
* Allocate at least 48MB of memory to each PHP process. (SilverStripe can be resource hungry for some intensive operations.)
* Required modules: dom, gd2, fileinfo, hash, iconv, mbstring, mysql (or other database driver), session, simplexml, tokenizer, xml.

2
docs/en/installation/windows-manual-iis-7.md
View File

@ -27,7 +27,7 @@ We'll also install SQL Server 2008 R2, and support for connecting to it in PHP.
* Internet Information Services (IIS) 7.x
* SQL Server 2008 R2
* PHP 5.4 (PHP 5.3.2+ also works, but we'll install with the latest PHP stable)
* PHP 5.4 (PHP 5.3.3+ also works, but we'll install with the latest PHP stable)
* SilverStripe 3
* [Microsoft URL Rewrite Module 2.0](http://www.iis.net/download/URLRewrite)
* [IIS 7 Administration Pack](http://www.iis.net/download/AdministrationPack) (ONLY required for Windows Vista or Server 2008)

4
main.php
View File

@ -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+. **
** **
************************************************************************************
************************************************************************************/
@ -14,7 +14,7 @@
* @subpackage core
*/
if (version_compare(phpversion(), '5.3.2', '<')) {
if (version_compare(phpversion(), '5.3.3', '<')) {
header("HTTP/1.1 500 Server Error");
echo str_replace('$PHPVersion', phpversion(), file_get_contents("dev/install/php5-required.html"));
die();

2
model/Image.php
View File

@ -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)) {