adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged fix into trunk

Browse source 
Revision: [2376]
Added fix from Ticket #556

Revision: [2375]
Added fix for Ticket #557

Revision: [2374]
Added fix for Ticket #552 and  Ticket #553

Revision: [2373]
Added fix for Ticket #554


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2377 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-03-19 14:13:07 +00:00
parent 5f249cd10e
commit 78441c007c
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/controller/components/request_handler.php
View file

@ -31,7 +31,7 @@
if (!defined('REQUEST_MOBILE_UA'))
{
define('REQUEST_MOBILE_UA', '[AvantGo|BlackBerry|DoCoMo|NetFront|Nokia|PalmOS|PalmSource|portalmmm|Plucker|ReqwirelessWeb|SonyEricsson|Symbian|UP\.Browser|Windows CE|Xiino]');
define('REQUEST_MOBILE_UA', '(AvantGo|BlackBerry|DoCoMo|NetFront|Nokia|PalmOS|PalmSource|portalmmm|Plucker|ReqwirelessWeb|SonyEricsson|Symbian|UP\.Browser|Windows CE|Xiino)');
}
/**
@ -202,7 +202,7 @@ class RequestHandlerComponent extends Object
}
/**
* Gets Prototype version if call is Ajax, otherwise empty string.
* Gets Prototype version if call is Ajax, otherwise empty string.
* The Prototype library sets a special "Prototype version" HTTP header.
*
* @return string Prototype version of component making Ajax call
@ -341,7 +341,7 @@ class RequestHandlerComponent extends Object
/**
* Strips the specified tags from output
*
* @param string $str
* @param string $str
* @param string $tag
* @param string $tag
* @param string ...
@ -423,8 +423,8 @@ class RequestHandlerComponent extends Object
/**
* Determines which content types the client prefers
*
* @param mixed $type
* @returns mixed
* @param mixed $type
* @returns mixed
* @access public
*/
function prefers($type = null)

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

@ -1169,7 +1169,7 @@ class DboSource extends DataSource
{
if($match['2'] != '' && !is_numeric($match['2']))
{
$match['2'] = $this->value($match['value']);
$match['2'] = $this->value($match['2']);
$match['2'] = str_replace(' AND ', "' AND '", $match['2']);
}

2
cake/libs/object.php
View file

@ -202,7 +202,7 @@ class Object
if(!file_exists($file))
{
$this->_savePersistent($name, &$object);
$this->_savePersistent($name, $object);
return false;
}
else

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

@ -154,7 +154,7 @@ function url($url = null, $return = false)
$base = $this->base;
if($this->plugin != null)
{
$match = str_replace('/', '', $this->plugin);
$match = str_replace(DS, '', $this->plugin);
$base = preg_replace('/'.$match.'/', '', $this->base);
$base = str_replace('//','', $base);
$pos1 = strrpos($base, '/');