Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #938614 by chx: bump to PHP 5.2.5.

merge-requests/26/head
Dries Buytaert 2010-10-12 03:10:03 +00:00
parent dc5991ce9c
commit 90c1a34782
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/bootstrap.inc
View File

@ -19,7 +19,7 @@ define('DRUPAL_CORE_COMPATIBILITY', '7.x');
/** /**
* Minimum supported version of PHP. * Minimum supported version of PHP.
*/ */
define('DRUPAL_MINIMUM_PHP', '5.2.0'); define('DRUPAL_MINIMUM_PHP', '5.2.5');
/** /**
* Minimum recommended value of PHP memory_limit. * Minimum recommended value of PHP memory_limit.
@ -1471,25 +1471,7 @@ function t($string, array $args = array(), array $options = array()) {
* @ingroup sanitization * @ingroup sanitization
*/ */
function check_plain($text) { function check_plain($text) {
// We do not want to use drupal_static() since PHP version will never change return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
// during a request.
static $php525;
if (!isset($php525)) {
$php525 = version_compare(PHP_VERSION, '5.2.5', '>=');
}
// We duplicate the preg_match() to validate strings as UTF-8 from
// drupal_validate_utf8() here. This avoids the overhead of an additional
// function call, since check_plain() may be called hundreds of times during
// a request. For PHP 5.2.5+, this check for valid UTF-8 should be handled
// internally by PHP in htmlspecialchars().
// See http://www.php.net/releases/5_2_5.php.
// @todo remove this when support for either IE6 or PHP < 5.2.5 is dropped.
if ($php525) {
return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
}
return (preg_match('/^./us', $text) == 1) ? htmlspecialchars($text, ENT_QUOTES, 'UTF-8') : '';
} }
/** /**

7
includes/file.inc
View File

@ -122,7 +122,12 @@ function file_get_stream_wrappers($filter = STREAM_WRAPPERS_ALL) {
else { else {
$wrappers[$scheme]['override'] = FALSE; $wrappers[$scheme]['override'] = FALSE;
} }
stream_wrapper_register($scheme, $info['class']); if (($info['type'] & STREAM_WRAPPERS_REMOTE) == STREAM_WRAPPERS_REMOTE) {
stream_wrapper_register($scheme, $info['class'], STREAM_IS_URL);
}
else {
stream_wrapper_register($scheme, $info['class']);
}
} }
// Pre-populate the static cache with the filters most typically used. // Pre-populate the static cache with the filters most typically used.
$wrappers_storage[STREAM_WRAPPERS_ALL][$scheme] = $wrappers[$scheme]; $wrappers_storage[STREAM_WRAPPERS_ALL][$scheme] = $wrappers[$scheme];