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

Adding fix to Test Suite.

Browse source 
Closes Ticket #279

Merging fixes to trunk

Revision: [1826]
Added fix for custom view classes

Revision: [1825]
Adding fix for Ticket #286

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1827 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-01-17 22:13:15 +00:00
parent afb97fc54d
commit 58e7bbc224
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
0.10.6.1820 RC 1
0.10.6.1827 RC 1

4
cake/libs/controller/controller.php
View file

@ -368,6 +368,10 @@ class Controller extends Object
$viewClass = $this->view.'View';
loadView($this->view);
}
if($this->view != 'View')
{
$viewClass = $this->view.'View';
}
$this->_viewClass =& new $viewClass($this);
if(!empty($this->modelNames))
{

10
cake/libs/model/dbo/dbo_mysql.php
View file

@ -285,7 +285,15 @@ class DboMysql extends DboSource
{
$data = mysql_real_escape_string($data, $this->connection);
}
return "'" . $data . "'";
if(!empty($data))
{
$return = "'" . $data . "'";
}
else
{
$return = "NULL";
}
return $return;
}
/**