Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -205,11 +205,12 @@ class _Db extends Table
|
||||
if ( isset( $options['multiple'] ) AND $options['multiple'] === TRUE )
|
||||
{
|
||||
$where[] = array( \IPS\Db::i()->in( $k, $v ) );
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
$where[] = array( "{$k}=?", $v );
|
||||
}
|
||||
// No break so we fall through to radio
|
||||
|
||||
case SEARCH_RADIO:
|
||||
$where[] = array( "{$k}=?", $v );
|
||||
break;
|
||||
|
||||
case SEARCH_MEMBER:
|
||||
@@ -308,7 +309,7 @@ class _Db extends Table
|
||||
$count = $count->first();
|
||||
|
||||
/* Now get column headers */
|
||||
$query = \IPS\Db::i()->select( '*', $this->table, NULL, NULL, array( 0, 1 ) );
|
||||
$query = \IPS\Db::i()->select( ( count( $selects ) ) ? $this->table . '.*, ' . implode( ', ', $selects ) : '*', $this->table, NULL, NULL, array( 0, 1 ) );
|
||||
|
||||
if ( count( $this->joins ) )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user