diff --git a/system/admin/admin.php b/system/admin/admin.php
index 4effd81..dbd1d1d 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -120,11 +120,10 @@ function add_content($title, $tag, $url, $content, $user, $draft, $category, $ty
 
     $post_date = date('Y-m-d-H-i-s');
     $post_title = safe_html($title);
-    if (defined('PHP_MAJOR_VERSION') && PHP_MAJOR_VERSION < 7) {
-        $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media));  
-    } else {
-        $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media ?? ''));    	
+    if (is_null($media)) {
+        $media = '';
     }
+    $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media));  
     $post_tag = strtolower(preg_replace(array('/[^a-zA-Z0-9,. \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($post_tag)));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     $description = safe_html($description);
@@ -264,11 +263,10 @@ function edit_content($title, $tag, $url, $content, $oldfile, $revertPost, $publ
     }
 
     $post_title = safe_html($title);
-    if (defined('PHP_MAJOR_VERSION') && PHP_MAJOR_VERSION < 7) {
-        $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media));  
-    } else {
-        $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media ?? ''));    	
+    if (is_null($media)) {
+        $media = '';
     }
+    $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media)); 
     $post_tag = strtolower(preg_replace(array('/[^a-zA-Z0-9,. \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($post_tag)));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     $description = safe_html($description);
diff --git a/system/includes/functions.php b/system/includes/functions.php
index a48e44e..904ee69 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -530,7 +530,7 @@ function get_category($category, $page, $perpage, $random)
 
 // Return category info.
 function get_category_info($category)
-{
+{			
     $posts = get_category_files();
 
     $tmp = array();
@@ -570,14 +570,11 @@ function get_category_info($category)
         }
     }
 
-    if (defined('PHP_MAJOR_VERSION') && PHP_MAJOR_VERSION < 7) {
-        if (strtolower($category) == 'uncategorized') {
-            return default_category();
-        }   
-    } else {
-        if (strtolower($category ?? '') == 'uncategorized') {
-            return default_category();
-        }
+    if (is_null($category)) {
+        $category = '';
+    }
+    if (strtolower($category) == 'uncategorized') {
+        return default_category();
     }
 
     return $tmp;