diff --git a/activate.php b/activate.php index 1001914a..d33e188c 100644 --- a/activate.php +++ b/activate.php @@ -76,7 +76,7 @@ function ( $result ) { */ function sqlite_plugin_copy_db_file() { // Bail early if the PDO SQLite extension is not loaded. - if ( ! extension_loaded( 'pdo_sqlite' ) ) { + if ( ! extension_loaded( 'pdo_sqlite' ) && ! extension_loaded( 'sqlite3' ) ) { return; } diff --git a/admin-notices.php b/admin-notices.php index a455cc86..3fe820bc 100644 --- a/admin-notices.php +++ b/admin-notices.php @@ -20,7 +20,7 @@ function sqlite_plugin_admin_notice() { } // If PDO SQLite is not loaded, bail early. - if ( ! extension_loaded( 'pdo_sqlite' ) ) { + if ( ! extension_loaded( 'pdo_sqlite' ) && ! extension_loaded( 'sqlite3' ) ) { printf( '

%s

', esc_html__( 'The SQLite Integration plugin is active, but the PDO SQLite extension is missing from your server. Please make sure that PDO SQLite is enabled in your PHP installation.', 'sqlite-database-integration' ) diff --git a/admin-page.php b/admin-page.php index cd8613cc..bff34039 100644 --- a/admin-page.php +++ b/admin-page.php @@ -61,7 +61,7 @@ function sqlite_integration_admin_screen() { ); ?>

- +

diff --git a/wp-includes/sqlite/db.php b/wp-includes/sqlite/db.php index dc50d22e..819ca5bc 100644 --- a/wp-includes/sqlite/db.php +++ b/wp-includes/sqlite/db.php @@ -33,7 +33,7 @@ ); } -if ( ! extension_loaded( 'pdo_sqlite' ) ) { +if ( ! extension_loaded( 'pdo_sqlite' ) && ! extension_loaded( 'sqlite3' ) ) { wp_die( new WP_Error( 'pdo_driver_not_loaded',