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

closes #3901 unnecessary setting of path in App::__settings, closes #4115 DboSource::fetchAll() does not need resultSet for every row

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7205 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-06-17 15:43:08 +00:00
parent b5c4681a11
commit 193959ebf3
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/configure.php
View file

@ -1042,11 +1042,9 @@ class App extends Object {
if ($plugin) { if ($plugin) {
$plugin = Inflector::underscore($plugin); $plugin = Inflector::underscore($plugin);
$name = Inflector::camelize($plugin); $name = Inflector::camelize($plugin);
$path = $plugin . DS;
} }
$load = strtolower($type);
$path = null; $path = null;
$load = strtolower($type);
switch ($load) { switch ($load) {
case 'model': case 'model':

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

@ -338,7 +338,11 @@ class DboSource extends DataSource {
if ($this->execute($sql)) { if ($this->execute($sql)) {
$out = array(); $out = array();
while ($item = $this->fetchRow()) { $first = $this->fetchRow();
if ($first != null){
$out[] = $first;
}
while (is_resource($this->_result) && $item = $this->fetchResult()) {
$out[] = $item; $out[] = $item;
} }