PostgreSQL-For-Wordpress/postgresql-for-wordpress
1
0
Fork 1
mirror of https://github.com/PostgreSQL-For-Wordpress/postgresql-for-wordpress.git synced 2025-08-01 10:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

PHP 8 compatibility fixes

Browse Source
This commit is contained in:
Matthew Bucci
2023-10-28 02:43:59 -07:00
parent f2a05dddbe
commit 1bde430f0d
2 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pg4wp/core.php
View File

@@ -9,6 +9,17 @@
* This file does all the initialisation tasks * This file does all the initialisation tasks
*/ */
// This is required by class-wpdb so we must load it first
require_once ABSPATH . '/wp-includes/cache.php';
require_once ABSPATH . '/wp-includes/l10n.php';
if (!function_exists('wpsql_is_resource')) {
function wpsql_is_resource($object)
{
return $object !== false && $object !== null;
}
}
// Logs are put in the pg4wp directory // Logs are put in the pg4wp directory
define( 'PG4WP_LOG', PG4WP_ROOT.'/logs/'); define( 'PG4WP_LOG', PG4WP_ROOT.'/logs/');
// Check if the logs directory is needed and exists or create it if possible // Check if the logs directory is needed and exists or create it if possible
@@ -26,13 +37,22 @@ $replaces = array(
'class wpdb' => 'class wpdb2', 'class wpdb' => 'class wpdb2',
'new wpdb' => 'new wpdb2', 'new wpdb' => 'new wpdb2',
'mysql_' => 'wpsql_', 'mysql_' => 'wpsql_',
'is_resource' => 'wpsql_is_resource',
'<?php' => '', '<?php' => '',
'?>' => '', '?>' => '',
); );
// Ensure class uses the replaced mysql_ functions rather than mysqli_ // Ensure class uses the replaced mysql_ functions rather than mysqli_
if (!defined('WP_USE_EXT_MYSQL')) {
define('WP_USE_EXT_MYSQL', true); define('WP_USE_EXT_MYSQL', true);
eval( str_replace( array_keys($replaces), array_values($replaces), file_get_contents(ABSPATH.'/wp-includes/wp-db.php'))); }
if (WP_USE_EXT_MYSQL != true) {
throw new \Exception("PG4SQL CANNOT BE ENABLED WITH MYSQLI, REMOVE ANY WP_USE_EXT_MYSQL configuration");
}
eval(str_replace(array_keys($replaces), array_values($replaces), file_get_contents(ABSPATH . '/wp-includes/class-wpdb.php')));
// Create wpdb object if not already done // Create wpdb object if not already done
if (! isset($wpdb) && defined('DB_USER')) if (! isset($wpdb) && defined('DB_USER')) {
$wpdb = new wpdb2( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST ); $wpdb = new wpdb2( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
}

25
pg4wp/db.php
View File

@@ -9,31 +9,42 @@ Author URI: http://www.hawkix.net
License: GPLv2 or newer. License: GPLv2 or newer.
*/ */
if( !defined('PG4WP_ROOT')) // Ensure we only load this config once
{ if(!defined('PG4WP_ROOT')) {
// You can choose the driver to load here // You can choose the driver to load here
define('DB_DRIVER', 'pgsql'); // 'pgsql' or 'mysql' are supported for now if (!defined('DB_DRIVER')) {
define('DB_DRIVER', pgsql);
}
// Set this to 'true' and check that `pg4wp` is writable if you want debug logs to be written // Set this to 'true' and check that `pg4wp` is writable if you want debug logs to be written
if (!defined('PG4WP_DEBUG')) {
define('PG4WP_DEBUG', false); define('PG4WP_DEBUG', false);
}
if (!defined('PG4WP_LOG_ERRORS')) {
// If you just want to log queries that generate errors, leave PG4WP_DEBUG to "false" // If you just want to log queries that generate errors, leave PG4WP_DEBUG to "false"
// and set this to true // and set this to true
define('PG4WP_LOG_ERRORS', true); define('PG4WP_LOG_ERRORS', true);
}
if (!defined('PG4WP_INSECURE')) {
// If you want to allow insecure configuration (from the author point of view) to work with PG4WP, // If you want to allow insecure configuration (from the author point of view) to work with PG4WP,
// change this to true // change this to true
define('PG4WP_INSECURE', false); define('PG4WP_INSECURE', false);
}
// This defines the directory where PG4WP files are loaded from // This defines the directory where PG4WP files are loaded from
// 3 places checked : wp-content, wp-content/plugins and the base directory // 3 places checked : wp-content, wp-content/plugins and the base directory
if( file_exists( ABSPATH.'/wp-content/pg4wp')) if(file_exists(ABSPATH . '/wp-content/pg4wp')) {
define('PG4WP_ROOT', ABSPATH . '/wp-content/pg4wp'); define('PG4WP_ROOT', ABSPATH . '/wp-content/pg4wp');
else if( file_exists( ABSPATH.'/wp-content/plugins/pg4wp')) } elseif(file_exists(ABSPATH . '/wp-content/plugins/pg4wp')) {
define('PG4WP_ROOT', ABSPATH . '/wp-content/plugins/pg4wp'); define('PG4WP_ROOT', ABSPATH . '/wp-content/plugins/pg4wp');
else if( file_exists( ABSPATH.'/pg4wp')) } elseif(file_exists(ABSPATH . '/pg4wp')) {
define('PG4WP_ROOT', ABSPATH . '/pg4wp'); define('PG4WP_ROOT', ABSPATH . '/pg4wp');
else } else {
die('PG4WP file directory not found'); die('PG4WP file directory not found');
}
// Here happens all the magic // Here happens all the magic
require_once(PG4WP_ROOT . '/core.php'); require_once(PG4WP_ROOT . '/core.php');