Fix more PHP 7.4 deprecation notices

CouchCMS · Mar 27, 2020 · bb23954 · bb23954
1 parent d64968f
commit bb23954
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/couch/field.php b/couch/field.php
@@ -199,7 +199,7 @@ function resolve_dynamic_params(){
                         $dyn_param = 'k_'.$dyn_param;
                     }
 
-                    if( array_key_exists($dyn_param, $this) && $this->$dyn_param ){
+                    if( property_exists($this, $dyn_param) && $this->$dyn_param ){
                         if( defined('K_SNIPPETS_DIR') ){ // always defined relative to the site
                             $base_snippets_dir = K_SITE_DIR . K_SNIPPETS_DIR . '/';
                         }

diff --git a/couch/includes/kcfinder/lib/class_input.php b/couch/includes/kcfinder/lib/class_input.php
@@ -35,7 +35,7 @@ class input {
     protected $magic_quotes_sybase;
 
     public function __construct() {
-        $this->magic_quotes_gpc = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
+        $this->magic_quotes_gpc = version_compare(phpversion(), "5.4.0", "<") && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
         $this->magic_quotes_sybase = ini_get('magic_quotes_sybase');
         $this->magic_quotes_sybase = $this->magic_quotes_sybase
             ? !in_array(strtolower(trim($this->magic_quotes_sybase)),