Merge branch 'master' of github.com:AgelxNash/DocLister

AgelxNash · Nov 7, 2018 · dddb87a · dddb87a
2 parents 5fb5347 + 3606d7a
commit dddb87a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/assets/lib/MODxAPI/modResource.php b/assets/lib/MODxAPI/modResource.php
@@ -633,6 +633,9 @@ public function save($fire_events = false, $clearCache = false)
             'docObj' => $this
         ), $fire_events);
 
+
+        $this->modx->getAliasListing($this->id);
+
         if ($clearCache) {
             $this->clearCache($fire_events);
         }

diff --git a/assets/snippets/DocLister/core/filterDocLister.abstract.php b/assets/snippets/DocLister/core/filterDocLister.abstract.php
@@ -207,6 +207,20 @@ protected function build_sql_where($table_alias, $field, $operator, $value)
                     $output = '';
                 }
                 break;
+            case 'containsAll':
+                $words = explode($this->DocLister->getCFGDef('filter_delimiter', ','), $value);
+                $word_arr = array();
+                foreach ($words as $word) {
+                    if (($likeWord = $this->DocLister->LikeEscape($output, $word)) !== '') {
+                        $word_arr[] = $likeWord;
+                    }
+                }
+                if (!empty($word_arr)) {
+                    $output = '(' . implode(' AND ', $word_arr) . ')';
+                } else {
+                    $output = '';
+                }
+            break;
             case 'in':
                 $output .= ' IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
                 break;