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

Using a simple regexp instead of a strpos to ensure the protocol is at the beginning of the url.

Browse source
This commit is contained in:
Mark Story 2010-10-29 22:10:24 -04:00
parent 3a95a546e8
commit 148870f492
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/router.php
View file

@ -824,8 +824,8 @@ class Router {
$output .= Inflector::underscore($params['controller']) . '/' . $url; $output .= Inflector::underscore($params['controller']) . '/' . $url;
} }
} }
$protocol = strpos($output, '://'); $protocol = preg_match('#^[a-z]+\://#', $output);
if ($protocol === false || $protocol > 6) { if ($protocol === 0) {
$output = str_replace('//', '/', $base . '/' . $output); $output = str_replace('//', '/', $base . '/' . $output);
if ($full && defined('FULL_BASE_URL')) { if ($full && defined('FULL_BASE_URL')) {