@@ -17,13 +17,13 @@ |
||
17 | 17 | $this->joinTables(); |
18 | 18 | |
19 | 19 | |
20 | - if(!empty($name)) |
|
20 | + if (!empty($name)) |
|
21 | 21 | $this->getQuery() |
22 | - ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $name ]); |
|
22 | + ->andFilterWhere([TaxonomyTerms::tableName().'.term' => $name]); |
|
23 | 23 | |
24 | - if(!empty($value)) |
|
24 | + if (!empty($value)) |
|
25 | 25 | $this->getQuery() |
26 | - ->andFilterWhere([ $this->taxonomy->table . '.value' => $value ]); |
|
26 | + ->andFilterWhere([$this->taxonomy->table.'.value' => $value]); |
|
27 | 27 | |
28 | 28 | return $this->getQuery(); |
29 | 29 | } |
@@ -17,13 +17,15 @@ |
||
17 | 17 | $this->joinTables(); |
18 | 18 | |
19 | 19 | |
20 | - if(!empty($name)) |
|
21 | - $this->getQuery() |
|
20 | + if(!empty($name)) { |
|
21 | + $this->getQuery() |
|
22 | 22 | ->andFilterWhere([ TaxonomyTerms::tableName() . '.term' => $name ]); |
23 | + } |
|
23 | 24 | |
24 | - if(!empty($value)) |
|
25 | - $this->getQuery() |
|
25 | + if(!empty($value)) { |
|
26 | + $this->getQuery() |
|
26 | 27 | ->andFilterWhere([ $this->taxonomy->table . '.value' => $value ]); |
28 | + } |
|
27 | 29 | |
28 | 30 | return $this->getQuery(); |
29 | 31 | } |
@@ -11,8 +11,9 @@ |
||
11 | 11 | if ($this->db->driverName === 'mysql') { |
12 | 12 | // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci |
13 | 13 | return 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB'; |
14 | - } else |
|
15 | - throw new Exception('Unsupported database.'); |
|
14 | + } else { |
|
15 | + throw new Exception('Unsupported database.'); |
|
16 | + } |
|
16 | 17 | } |
17 | 18 | |
18 | 19 | public function up() |