Merge pull request #9 from quantum-dragons/fix-augment-sql

Fix issue where extension owner doesn't respect subsite
adrexia · Mar 6, 2019 · 8b12444 · 8b12444
2 parents d09d820 + be2fa50
commit 8b12444
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/src/SubsiteModelExtension.php b/src/SubsiteModelExtension.php
@@ -42,29 +42,28 @@ public function onBeforeWrite() {
      * @param DataQuery $dataQuery Container DataQuery for this SQLSelect
      */
     public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null) {
+        if (Subsite::$disable_subsite_filter) {
+            return;
+        }
+
+        // If you're querying by ID, ignore the sub-site
+        if ($query->filtersOnID()) {
+            return;
+        }
+        $regexp = '/^(.*\.)?("|`)?SubsiteID("|`)?\s?=/';
+        foreach ($query->getWhereParameterised($parameters) as $predicate) {
+            if (preg_match($regexp, $predicate)) {
+                return;
+            }
+        }
+
+        $subsiteID = (int)SubsiteState::singleton()->getSubsiteId();
 
-        // if (Subsite::$disable_subsite_filter) {
-        //     return;
-        // }
-        //
-        // // If you're querying by ID, ignore the sub-site
-        // if ($query->filtersOnID()) {
-        //     return;
-        // }
-        // $regexp = '/^(.*\.)?("|`)?SubsiteID("|`)?\s?=/';
-        // foreach ($query->getWhereParameterised($parameters) as $predicate) {
-        //     if (preg_match($regexp, $predicate)) {
-        //         return;
-        //     }
-        // }
-        //
-        // $subsiteID = (int)Subsite::currentSubsiteID();
-        //
-        // $froms=$query->getFrom();
-        // $froms=array_keys($froms);
-        // $tableName = array_shift($froms);
-        // if ($tableName === $this->owner->ClassName) {
-        //     $query->addWhere("\"$tableName\".\"SubsiteID\" IN ($subsiteID)");
-        // }
+        $froms=$query->getFrom();
+        $froms=array_keys($froms);
+        $tableName = array_shift($froms);
+        if ($tableName == $this->owner->baseTable()) {
+            $query->addWhere("\"$tableName\".\"SubsiteID\" IN ($subsiteID)");
+        }
     }
 }