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

Fixing /admin issue with HtmlHelper::url() (Sort-of covered by Ticket #1340)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3436 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-08-27 17:49:50 +00:00
parent b46c20ead4
commit 00df232f9e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/libs/view/helpers/html.php
View file

@ -212,6 +212,9 @@ class HtmlHelper extends Helper {
if (isset($url['ext'])) { if (isset($url['ext'])) {
$extension = '.' . $url['ext']; $extension = '.' . $url['ext'];
} }
if (defined('CAKE_ADMIN') && !isset($url[CAKE_ADMIN]) && isset($this->params['admin'])) {
$url[CAKE_ADMIN] = $this->params['admin'];
}
$named = $args = array(); $named = $args = array();
$keys = array_keys($url); $keys = array_keys($url);
@ -238,11 +241,17 @@ class HtmlHelper extends Helper {
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$named[$i] = join($this->argSeparator, $named[$i]); $named[$i] = join($this->argSeparator, $named[$i]);
} }
if (defined('CAKE_ADMIN') && isset($named[CAKE_ADMIN])) {
unset($named[CAKE_ADMIN]);
}
$combined = join('/', $named); $combined = join('/', $named);
} }
$url = array_filter(array($url['plugin'], $url['controller'], $url['action'], join('/', array_filter($args)), $combined)); $urlOut = array_filter(array($url['plugin'], $url['controller'], $url['action'], join('/', array_filter($args)), $combined));
$output = $base . '/' . join('/', $url); if (defined('CAKE_ADMIN') && isset($url[CAKE_ADMIN]) && $url[CAKE_ADMIN]) {
array_unshift($urlOut, CAKE_ADMIN);
}
$output = $base . '/' . join('/', $urlOut);
} else { } else {
if (((strpos($url, '://')) || (strpos($url, 'javascript:') === 0) || (strpos($url, 'mailto:') === 0)) || $url == '#') { if (((strpos($url, '://')) || (strpos($url, 'javascript:') === 0) || (strpos($url, 'mailto:') === 0)) || $url == '#') {
return $this->output($url); return $this->output($url);