Fix: Stream Channel was set for AdminOnly pages

humhub · Feb 23, 2021 · 6a2398a · 6a2398a
1 parent 31768b8
commit 6a2398a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.3.1 (February 23, 2021)
+-------------------------
+- Fix: Stream Channel was set for AdminOnly pages
+
+
 1.3.0 (February 22, 2021)
 -------------------------
 - Fix #88: Text alignment resets when reloading ckeditor input

diff --git a/models/CustomContentContainer.php b/models/CustomContentContainer.php
@@ -445,12 +445,6 @@ public function getIcon() {
      */
     public function beforeSave($insert)
     {
-        if($this->checkAbstract() && !$this->admin_only) {
-            $this->streamChannel = 'default';
-        } else {
-            $this->streamChannel = null;
-        }
-
         switch($this->visibility) {
             case static::VISIBILITY_ADMIN_ONLY:
                 $this->admin_only = 1;
@@ -466,6 +460,12 @@ public function beforeSave($insert)
                 break;
         }
 
+        if($this->checkAbstract() && !$this->admin_only) {
+            $this->streamChannel = 'default';
+        } else {
+            $this->streamChannel = null;
+        }
+
         return parent::beforeSave($insert);
     }