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

Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

Browse source
This commit is contained in:
Mark Story 2010-01-13 23:47:59 -05:00
commit eb2c34afa0
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/libs/model/datasources/datasource.php
View file

@ -123,9 +123,9 @@ class DataSource extends Object {
var $_queriesLog = array();
/**
* Maximum number of items in query log, to prevent query log taking over
* too much memory on large amounts of queries -- I we've had problems at
* >6000 queries on one system.
* Maximum number of items in query log
*
* This is to prevent query log taking over too much memory.
*
* @var int Maximum number of queries in the queries log.
* @access protected
@ -270,7 +270,8 @@ class DataSource extends Object {
if ($this->cacheSources === false) {
return null;
}
$table = $this->fullTableName($model, false);
$table = $model->tablePrefix . $model->table;
if (isset($this->__descriptions[$table])) {
return $this->__descriptions[$table];
}
@ -374,7 +375,7 @@ class DataSource extends Object {
* To-be-overridden in subclasses.
*
* @param Model $model The model class having record(s) deleted
* @param mixed $id Primary key of the model
* @param mixed $id Primary key of the model
* @access public
*/
function delete(&$model, $id = null) {
@ -489,7 +490,7 @@ class DataSource extends Object {
* @param array $data Array of data with values that will be inserted in placeholders.
* @param string $association Name of association model being replaced
* @param unknown_type $assocData
* @param Model $model Instance of the model to replace $__cakeID__$
* @param Model $model Instance of the model to replace $__cakeID__$
* @param Model $linkModel Instance of model to replace $__cakeForeignKey__$
* @param array $stack
* @return string String of query data with placeholders replaced.

3
cake/tests/lib/cake_test_suite_dispatcher.php
View file

@ -76,7 +76,8 @@ class CakeTestSuiteDispatcher {
*/
function CakeTestSuiteDispatcher() {
$this->_baseUrl = $_SERVER['PHP_SELF'];
$this->_baseDir = dirname($this->_baseUrl) . '/';
$dir = dirname($this->_baseUrl);
$this->_baseDir = ($dir === '/') ? $dir : $dir . '/';
}
/**

4
cake/tests/lib/templates/footer.php
View file

@ -20,9 +20,11 @@
?> </div>
</div>
<div id="footer">
<p>
<!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
<a href="http://www.cakephp.org/" target="_blank">
<img src="<?php echo $baseDir; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a></p>
<img src="<?php echo $baseDir; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a>
</p>
</div>
<?php
App::import('Core', 'View');