Merging fixes to trunk

Revision: [1773]
adding fixes to PHP 5 model class

Revision: [1772]
Fixed errors in PHP model.
Fixed parse error in CakeSession Class.
Added stripslashes_deep function to basics.php
Fixed errors in Dispatcher class.

Revision: [1771]
reverting changes in last commit

Revision: [1770]
Fixing save() in model

Revision: [1769]
correcting more errors that we are finding

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1774 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-01-12 16:55:46 +00:00
parent 842b97d622
commit dd3de20200
11 changed files with 86 additions and 69 deletions

View file

@ -240,7 +240,7 @@ class CakeSession extends Object
{
if(!empty($_SESSION))
{
$result = eval("return ".$_SESSION.";");
$result = eval("return \$_SESSION;");
return $result;
}
$this->_setError(2, "No Session vars set");