Merge branch 'development'

nilsteampassnet · May 2, 2018 · 10f7d05 · 10f7d05
2 parents 91f908f + f2f2fb2
commit 10f7d05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/install/upgrade_run_2.1.27.php b/install/upgrade_run_2.1.27.php
@@ -209,7 +209,7 @@ function columnExists($tablename, $column)
     // Change name of field
     mysqli_query($db_link, "ALTER TABLE `".$pre."misc` CHANGE `id` `increment_id` INT(12) NOT NULL AUTO_INCREMENT");
 } elseif ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding increment_id user_ip to table misc! '.mysqli_error($db_link).'!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding increment_id to table misc! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }

diff --git a/sources/main.functions.php b/sources/main.functions.php
@@ -2227,7 +2227,7 @@ function getFileExtension(string $file)
  * @param  string $type What clean to perform
  * @return string
  */
-function cleanText(string $string, string $type = null)
+function cleanText(string $string, $type = null)
 {
     global $SETTINGS;
 
@@ -2238,7 +2238,7 @@ function cleanText(string $string, string $type = null)
     if ($type === "css") {
         // Escape text and quotes in UTF8 format
         return htmlentities($string, ENT_QUOTES | ENT_HTML5, 'UTF-8');
-    } elseif ($type === "html" || empty($type) === true) {
+    } elseif (empty($type) === true || is_null($type) === true || $type === "html") {
         // Html cleaner
         return $antiXss->xss_clean($string);
     }