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

Merge branch '1.3-misc' into write-route

Browse source
This commit is contained in:
mark_story 2009-11-28 23:04:22 -05:00
commit d70689ecda
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/dispatcher.php
View file

@ -297,7 +297,7 @@ class Dispatcher extends Object {
$params['action'] = 'index';
}
if (isset($params['form']['data'])) {
$params['data'] = Router::stripEscape($params['form']['data']);
$params['data'] = $params['form']['data'];
unset($params['form']['data']);
}
if (isset($_GET)) {

2
cake/libs/model/datasources/dbo_source.php
View file

@ -1933,7 +1933,7 @@ class DboSource extends DataSource {
} else {
$data = $this->__quoteFields($key) . ' IN (';
}
if ($quoteValues || strpos($value[0], '-!') !== 0) {
if ($quoteValues) {
if (is_object($model)) {
$columnType = $model->getColumnType($key);
}

18
cake/libs/string.php
View file

@ -28,24 +28,6 @@
*/
class String {
/**
* Gets a reference to the String object instance
*
* @return object String instance
* @access public
* @static
* @deprecated
*/
function &getInstance() {
trigger_error('String::getInstance() is deprecated. All String methods are called statically.', E_USER_WARNING);
static $instance = array();
if (!$instance) {
$instance[0] =& new String();
}
return $instance[0];
}
/**
* Generate a random UUID
*