fixes

CarnetApp · Dec 4, 2018 · 2db4f8a · 2db4f8a
1 parent edb38eb
commit 2db4f8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/Controller/NoteController.php b/lib/Controller/NoteController.php
@@ -782,25 +782,34 @@ public function setAppTheme($url){
      * @NoCSRFRequired
      */
       public function getEditorCss(){
-        return json_decode($this->Config->getUserValue($this->userId, $this->appName, "css_editor"));
+        $css = $this->Config->getUserValue($this->userId, $this->appName, "css_editor");
+        if(empty($css))
+          $css = "[]";
+        return json_decode($css);
       }
 
       /**
      * @NoAdminRequired
      * @NoCSRFRequired
      */
     public function getBrowserCss(){
-        return json_decode($this->Config->getUserValue($this->userId, $this->appName, "css_browser"));
-      }
+        $css = $this->Config->getUserValue($this->userId, $this->appName, "css_browser");
+        if(empty($css))
+          $css = "[]";
+        return json_decode($css);
+    }
 
 
       /**
      * @NoAdminRequired
      * @NoCSRFRequired
      */
     public function getSettingsCss(){
-        return json_decode($this->Config->getUserValue($this->userId, $this->appName, "css_settings"));
-      }
+        $css = $this->Config->getUserValue($this->userId, $this->appName, "css_settings");
+        if(empty($css))
+          $css = "[]";
+        return json_decode($css);
+    }
 
 
  }

diff --git a/templates/index.php b/templates/index.php
@@ -12,7 +12,7 @@
 
 preg_match_all('/<script.*?src=\"(.*?\.js(?:\?.*?)?)"/si', $file, $matches, PREG_PATTERN_ORDER);
 for ($i = 0; $i < count($matches[1]); $i++) {
-    script("carnet","../templates/CarnetElectron/".substr($matches[1][$i],0,-3));
+    script("carnet","../templates/CarnetElectron/".substr($matches[1][$i],0,-3)."?t=".time());
 }
 if($_['carnet_display_fullscreen']==="yes")
     script("carnet","../templates/CarnetElectron/compatibility/nextcloud/browser_fullscreen");