mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Fixes #4111 Inconsistent results under some circumstances with e107::getDb()->retrieve(). Tests have been added to this commit.

Browse Source
This commit is contained in:
Cameron
2020-03-13 15:06:26 -07:00
parent eb96f14fe9
commit 5471a84746
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/mysql_class.php
View File

@@ -465,7 +465,7 @@ class e_db_mysql implements e_db
* $array = e107::getDb()->retrieve(null, null, null, true, 'user_id');
* }
*
* // Using whole query example, in this case default mode is 'single'
* // Using whole query example, in this case default mode is 'one'
* $array = e107::getDb()->retrieve('SELECT
* p.*, u.user_email, u.user_name FROM `#user` AS u
* LEFT JOIN `#myplug_table` AS p ON p.myplug_table=u.user_id
@@ -528,7 +528,10 @@ class e_db_mysql implements e_db
{
// gen()
$select = false;
if($mode == 'one') $mode = 'single';
if($mode == 'one' && !preg_match('/[,*]+[\s\S]*FROM/im',$table)) // if a comma or astericks is found before "FROM" then leave it in 'one' row mode.
{
$mode = 'single';
}
}
// auto detect noWhere - if where string starts with upper case LATIN word
elseif(!$where || preg_match('/^[A-Z]+\S.*$/', trim($where)))