Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jangaraev committed Jul 3, 2017
1 parent 8c08d7b commit 9df28e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion includes/classes/ia.core.users.php
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,8 @@ public function coreSearch($stmt, $start, $limit, $order)
$rows = $this->iaDb->all(iaDb::STMT_CALC_FOUND_ROWS . ' ' . iaDb::ALL_COLUMNS_SELECTION, $stmt, $start, $limit,
self::getTable());
$count = $this->iaDb->foundRows();
!$rows || $this->_processValues($rows);

$this->_processValues($rows);

return [$count, $rows];
}
Expand Down
4 changes: 3 additions & 1 deletion includes/classes/ia.front.search.php
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,9 @@ private function _processParams($params, $processRequestUri = false)

if ($params && is_array($params)) {
foreach ($params as $fieldName => $value) {
empty($this->getOption('columnAlias')->$fieldName) || ($fieldName = $this->getOption('columnAlias')->$fieldName);
$fieldName = empty($this->getOption('columnAlias')->$fieldName)
? iaSanitize::paranoid($fieldName)
: $this->getOption('columnAlias')->$fieldName;

if (empty($value) ||
(!isset($this->_fieldTypes[$fieldName]) && ($this->getOption('customColumns') && !in_array($fieldName, $this->_options['customColumns'])))) {
Expand Down

0 comments on commit 9df28e0

Please sign in to comment.