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

Updated VERSION file

Browse source 
Merging:

Revision: [1644]
Bad merge last commit had second param in the class_exists() call

Revision: [1643]
Fixed errors introduced in last changes:
Variable that was passed the loadController function was not expected controller class name,
It was the name fo the class without Controller. This would cause the loading to fail, since
it was possible that a class was already loaded with the name that was passed.
Example NewsController and a model called News.

Revision: [1642]
Added patch for MySql 5

Revision: [1641]
removing second parameter in the class_exists function calls.
closes Ticket #209

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1645 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-12-27 17:14:32 +00:00
parent 436f196f7f
commit f0fe2102ec
14 changed files with 31 additions and 24 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.4.1640_beta
0.10.4.1645_beta

10
cake/basics.php
View file

@ -61,7 +61,7 @@ if (!function_exists("ob_get_clean"))
*/
function loadModels ()
{
if(!class_exists('AppModel', FALSE))
if(!class_exists('AppModel'))
{
if(file_exists(APP.'app_model.php'))
{
@ -88,7 +88,7 @@ function loadModels ()
*/
function loadControllers ()
{
if(!class_exists('AppController', FALSE))
if(!class_exists('AppController'))
{
if(file_exists(APP.'app_controller.php'))
{
@ -101,7 +101,7 @@ function loadControllers ()
}
foreach (listClasses(CONTROLLERS) as $controller)
{
if(!class_exists($controller, FALSE))
if(!class_exists($controller))
{
require_once (CONTROLLERS.$controller.'.php');
}
@ -116,7 +116,7 @@ function loadControllers ()
*/
function loadController ($name)
{
if(!class_exists('AppController', FALSE))
if(!class_exists('AppController'))
{
if(file_exists(APP.'app_controller.php'))
{
@ -127,7 +127,7 @@ function loadController ($name)
require_once(CAKE.'app_controller.php');
}
}
if(!class_exists($name, FALSE))
if(!class_exists($name.'Controller'))
{
$name = Inflector::underscore($name);
if(file_exists(CONTROLLERS.$name.'_controller.php'))

19
cake/dispatcher.php
View file

@ -122,16 +122,19 @@ class Dispatcher extends Object
$ctrlName = Inflector::camelize($params['controller']);
$ctrlClass = $ctrlName.'Controller';
if (!loadController($params['controller']) || !class_exists($ctrlClass, FALSE))
if(!class_exists($ctrlClass))
{
if(preg_match('/([\\.]+)/',$ctrlName))
if (!loadController($ctrlName))
{
$this->error404(strtolower($ctrlName),'Was not found on this server');
exit();
}
else
{
$missingController = true;
if(preg_match('/([\\.]+)/',$ctrlName))
{
$this->error404(strtolower($ctrlName),'Was not found on this server');
exit();
}
else
{
$missingController = true;
}
}
}
}

2
cake/libs/cache.php
View file

@ -33,7 +33,7 @@
* Included libraries.
*
*/
if(!class_exists('Model', FALSE))
if(!class_exists('Model'))
{
uses(DS.'model'.DS.'model');
}

2
cake/libs/controller/component.php
View file

@ -106,7 +106,7 @@ class Component extends Object
{
require_once $componentFn;
if(class_exists($componentCn, FALSE)===true)
if(class_exists($componentCn)===true)
{
if($componentCn == 'SessionComponent')
{

2
cake/libs/file.php
View file

@ -31,7 +31,7 @@
* Included libraries.
*
*/
if(!class_exists('Object', FALSE))
if(!class_exists('Object'))
{
uses('object');
}

2
cake/libs/flay.php
View file

@ -32,7 +32,7 @@
* Included libraries.
*
*/
if(!class_exists('Object', FALSE))
if(!class_exists('Object'))
{
uses('object');
}

2
cake/libs/folder.php
View file

@ -31,7 +31,7 @@
* Included libraries.
*
*/
if(!class_exists('Object', FALSE))
if(!class_exists('Object'))
{
uses('object');
}

2
cake/libs/inflector.php
View file

@ -32,7 +32,7 @@
* Included libraries.
*
*/
if(!class_exists('Object', FALSE))
if(!class_exists('Object'))
{
uses('object');
}

2
cake/libs/log.php
View file

@ -32,7 +32,7 @@
* Included libraries.
*
*/
if(!class_exists('File', FALSE))
if(!class_exists('File'))
{
uses('file');
}

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

@ -795,6 +795,10 @@ class Model extends Object
{
if ($this->hasField($x))
{
if($x == $this->primaryKey && $y === '')
{
continue;
}
$fields[] = $x;
$values[] = (ini_get('magic_quotes_gpc') == 1) ?
$this->db->prepare(stripslashes($y)) : $this->db->prepare($y);

2
cake/libs/object.php
View file

@ -116,7 +116,7 @@ class Object
*/
function log ($msg, $type=LOG_ERROR)
{
if(!class_exists('Log', FALSE))
if(!class_exists('Log'))
{
uses('log');
}

2
cake/libs/router.php
View file

@ -31,7 +31,7 @@
* Included libraries.
*
*/
if(!class_exists('Object', FALSE))
if(!class_exists('Object'))
{
uses('object');
}

2
cake/libs/view/view.php
View file

@ -613,7 +613,7 @@ class View extends Object
$replace = strtolower(substr($helper, 0, 1));
$camelBackedHelper = preg_replace('/\\w/', $replace, $helper, 1);
if(class_exists($helperCn, FALSE))
if(class_exists($helperCn))
{
${$camelBackedHelper} =& new $helperCn;
${$camelBackedHelper}->base = $this->base;