Skip to content

Commit

Permalink
Fixed issue #11574: Search box in main survey list is case sensitive
Browse files Browse the repository at this point in the history
Dev: Also fixing the same problem in tokens list
  • Loading branch information
Aestu committed Sep 10, 2016
1 parent 9303c2c commit 52ecf96
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
40 changes: 40 additions & 0 deletions application/core/LSDbCriteria.php
@@ -0,0 +1,40 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
* LimeSurvey
* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
*
*/

class LSDbCriteria extends CDbCriteria
{
/**
* Basic initialiser to the base controller class
*
* @access public
* @param string $column The name of the column to be searched
* @param mixed $value The column value to be compared with
* @param boolean $partialMatch Whether the value should consider partial text match
* @param string $operator The operator used to concatenate the new condition with the existing one
* @param boolean $escape Whether the value should be escaped if $partialMatch is true and the value contains characters % or _
* @return void
*/
// public function compare(string $column, mixed $value, boolean $partialMatch=false, string $operator='AND', boolean $escape=true)
public function compare($column, $value, $partialMatch=false, $operator='AND', $escape=true)
{
if ($partialMatch && Yii::app()->db->getDriverName()=='pgsql')
{
$this->addSearchCondition($column, $value, true, $operator, 'ILIKE');
}
else
{
parent::compare($column, $value, $partialMatch, $operator, $escape);
}
}
}
2 changes: 1 addition & 1 deletion application/models/Survey.php
Expand Up @@ -989,7 +989,7 @@ public function search()
);
$sort->defaultOrder = array('creation_date' => CSort::SORT_DESC);

$criteria = new CDbCriteria;
$criteria = new LSDbCriteria;
$aWithRelations = array('correct_relation_defaultlanguage');

// Search filter
Expand Down
2 changes: 1 addition & 1 deletion application/models/TokenDynamic.php
Expand Up @@ -964,7 +964,7 @@ public function search()
);
}

$criteria = new CDbCriteria;
$criteria = new LSDbCriteria;
$criteria->compare('tid',$this->tid,false);
$criteria->compare('token',$this->token,true);
$criteria->compare('firstname',$this->firstname,true);
Expand Down

0 comments on commit 52ecf96

Please sign in to comment.