Просмотр исходного кода

Fix php error + add remove script for /edit/server/theme

Jaap Marcus 4 лет назад
Родитель
Сommit
cb462e729d
2 измененных файлов с 6 добавлено и 1 удалено
  1. 5 0
      install/upgrade/versions/1.4.13.sh
  2. 1 1
      web/inc/main.php

+ 5 - 0
install/upgrade/versions/1.4.13.sh

@@ -48,3 +48,8 @@ fi
 if [ -d "$HESTIA/web/edit/file/" ]; then
     rm -fr $HESTIA/web/edit/file/
 fi
+
+# Not used any more
+if [ -d "$HESTIA/web/edit/server/theme/" ]; then
+    rm -fr $HESTIA/web/edit/server/theme/
+fi

+ 1 - 1
web/inc/main.php

@@ -173,7 +173,7 @@ function render_page($user, $TAB, $page)
 // Usage: verify_csrf($_POST) or verify_csrf($_GET); Use verify_csrf($_POST,true) to return on failure instead of redirect
 function verify_csrf($method, $return = false)
 {
-    if ($method['token'] !== $_SESSION['token'] || empty($method['token'] || empty($_SESSION['token'])) {
+    if ($method['token'] !== $_SESSION['token'] || empty($method['token']) || empty($_SESSION['token'])) {
         if ($return === true) {
                 return false;
             } else {