Author: phpnut
Date: 2:44:40 AM, Monday, October 24, 2005
Message:
Should complete work on new look for scaffold

[1187]
Author: phpnut
Date: 1:59:09 AM, Monday, October 24, 2005
Message:
More work on scaffold to get all changes done in the last few days correctly displaying.

Fix for Ticket #89

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1189 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-10-24 07:51:09 +00:00
parent dd6024b1c4
commit 2acd3acbf6
13 changed files with 190 additions and 180 deletions

View file

@ -399,23 +399,23 @@ function params($p)
*
* @return string
*/
function setUri() {
if (isset($_SERVER['REQUEST_URI']))
function setUri()
{
$uri = $_SERVER['REQUEST_URI'];
}
else
{
if (isset($_SERVER['argv']))
if (isset($_SERVER['REQUEST_URI']))
{
$uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['argv'][0];
$uri = $_SERVER['REQUEST_URI'];
}
else
{
$uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['QUERY_STRING'];
if (isset($_SERVER['argv']))
{
$uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['argv'][0];
}
else
{
$uri = $_SERVER['PHP_SELF'] .'/'. $_SERVER['QUERY_STRING'];
}
}
}
return $uri;
}
return $uri;
}
?>