Skip to content

Commit

Permalink
Merge pull request #392 from mateu-aguilo-bosch/392-typo
Browse files Browse the repository at this point in the history
Typo in method name \RestfulDataProviderEFQ::isValidConjuctionForFilter
  • Loading branch information
e0ipso committed Jan 26, 2015
2 parents 0c42051 + 83babdc commit 24fe14f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions plugins/restful/RestfulBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ protected function parseRequestForListFilter() {
$value['operator'] = str_replace(array('"', "'"), '', $value['operator']);

static::isValidOperatorsForFilter($value['operator']);
static::isValidConjuctionForFilter($value['conjunction']);
static::isValidConjunctionForFilter($value['conjunction']);

$filters[] = $value;
}
Expand Down Expand Up @@ -1068,7 +1068,7 @@ protected static function isValidOperatorsForFilter(array $operators) {
*
* @throws RestfulBadRequestException
*/
protected static function isValidConjuctionForFilter($conjunction) {
protected static function isValidConjunctionForFilter($conjunction) {
$allowed_conjunctions = array(
'AND',
'OR',
Expand Down
2 changes: 1 addition & 1 deletion plugins/restful/RestfulDataProviderCToolsPlugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function getPluginsSortedAndFiltered() {
/**
* Overrides \RestfulBase::isValidConjuctionForFilter().
*/
protected static function isValidConjuctionForFilter($conjunction) {
protected static function isValidConjunctionForFilter($conjunction) {
$allowed_conjunctions = array(
'AND',
'OR',
Expand Down
2 changes: 1 addition & 1 deletion plugins/restful/RestfulDataProviderEFQ.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ protected function getColumnFromProperty($property_name) {
/**
* Overrides \RestfulBase::isValidConjuctionForFilter().
*/
protected static function isValidConjuctionForFilter($conjunction) {
protected static function isValidConjunctionForFilter($conjunction) {
$allowed_conjunctions = array(
'AND',
);
Expand Down

0 comments on commit 24fe14f

Please sign in to comment.