adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding fix for #1989

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4423 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-02-03 02:32:42 +00:00
parent 944e1d98bb
commit 0c9c0e44b4
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cake/libs/router.php
View file

@ -61,6 +61,12 @@ class Router extends Overloadable {
* @var boolean
*/
var $__parseExtensions = false;
/**
* Array of valid extensions to parse from a url
*
* @var boolean
*/
var $__validExtensions = array();
/**
* 'Constant' regular expression definitions for named route elements
*
@ -251,9 +257,22 @@ class Router extends Overloadable {
if (strpos($url, '?') !== false) {
$url = substr($url, 0, strpos($url, '?'));
}
if ($_this->__parseExtensions && preg_match('/\.[0-9a-zA-Z]*$/', $url, $ext) == 1) {
$ext = substr($ext[0], 1);
$url = substr($url, 0, strpos($url, '.' . $ext));
if ($_this->__parseExtensions) {
if(preg_match('/\.[0-9a-zA-Z]*$/', $url, $match) == 1) {
$match = substr($match[0], 1);
if(is_null($_this->__validExtensions)) {
$url = substr($url, 0, strpos($url, '.' . $match));
$ext = $match;
} else {
foreach($_this->__validExtensions AS $name) {
if(strcasecmp($name, $match) === 0) {
$url = substr($url, 0, strpos($url, '.' . $name));
$ext = $match;
}
}
}
}
}
foreach($_this->routes as $route) {
@ -677,11 +696,16 @@ class Router extends Overloadable {
* automatically switch to alternate layouts and templates, and load helpers
* corresponding to the given content, i.e. RssHelper.
*
* An array of valid extension can be passed to this method. $extensions = array('rss', 'xml')
* If null is passed anything after a . in the url will be considered an extension
*
* @param mixed $extensions
* @return void
*/
function parseExtensions() {
function parseExtensions($extensions = null) {
$_this =& Router::getInstance();
$_this->__parseExtensions = true;
$_this->__validExtensions = $extensions;
}
}