diff --git a/class/class-mainwp-child-db.php b/class/class-mainwp-child-db.php index 00926e2d..14a92a44 100644 --- a/class/class-mainwp-child-db.php +++ b/class/class-mainwp-child-db.php @@ -179,7 +179,7 @@ public static function real_escape_string( $value ) { */ public static function is_result( $result ) { if ( self::use_mysqli() ) { - return ( $result instanceof mysqli_result ); + return ( $result instanceof \mysqli_result ); } else { return is_resource( $result ); } diff --git a/class/class-mainwp-security.php b/class/class-mainwp-security.php index cb768c8c..9ab9935a 100644 --- a/class/class-mainwp-security.php +++ b/class/class-mainwp-security.php @@ -451,7 +451,18 @@ public static function remove_database_reporting_ok() { * @return bool true|false If the PHP error reporting has been disabled, return true, if not, return false. */ public static function remove_php_reporting_ok() { - return ! ( ( ( 0 != ini_get( 'display_errors' ) ) && ( 'off' != ini_get( 'display_errors' ) ) ) || ( ( 0 != ini_get( 'display_startup_errors' ) ) && ( 'off' != ini_get( 'display_startup_errors' ) ) ) ); + $is_ok = true; + $display_off = ini_get( 'display_errors' ); + if ( ! empty( $display_off ) ) { + $display_off = strtolower( $display_off ); + $is_ok = ( $is_ok || 'off' === $display_off ); + } + $display_startup_off = ini_get( 'display_startup_errors' ); + if ( ! empty( $display_startup_off ) ) { + $display_startup_off = strtolower( $display_startup_off ); + $is_ok = ( $is_ok || 'off' === $display_startup_off ); + } + return $is_ok; } /**