diff --git a/pdodb.class.php b/pdodb.class.php index 3f342b9..db927a9 100644 --- a/pdodb.class.php +++ b/pdodb.class.php @@ -45,6 +45,16 @@ class PDODB extends wpdb { return true; } + /** + * dummy out the MySQL function + * @see wpdb::set_charset() + */ + function set_charset($dbh, $charset = null, $collate = null) { + if ( ! isset( $charset ) ) + $charset = $this->charset; + if ( ! isset( $collate ) ) + $collate = $this->collate; + } /** * dummy out the MySQL function * @see wpdb::select() @@ -61,10 +71,7 @@ class PDODB extends wpdb { * @see wpdb::_real_escape() */ function _real_escape($string) { - if ($this->dbh && $this->real_escape) - return $this->dbh->quote($string); - else - return addslashes($string); + return addslashes($string); } /** diff --git a/readme-ja.txt b/readme-ja.txt index 7ca25d9..00d923d 100644 --- a/readme-ja.txt +++ b/readme-ja.txt @@ -7,7 +7,7 @@ Author: Kojima Toshiyasu Author URI: http://dogwood.skr.jp/ Requires at least: 3.3 Tested up to: 3.6 -Stable tag: 1.2 +Stable tag: 1.2.1 License: GPLv2 License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -167,6 +167,9 @@ SQLite Integrationのアップグレードに失敗するようなら、FTPを == Changelog == += 1.2.1 (2013-08-04) = +* wp-db.php の変更にともなう修正をしました。WordPress 3.6 との互換性を保つためのものです。 + = 1.2 (2013-08-03) = * カレンダー・ウィジェットでの不具合に対応するため、日付フォーマットとそのクオートを修正しました。 * Windows マシンでパッチファイルが削除できなかったのを修正しました。 diff --git a/readme.txt b/readme.txt index 54d0a5b..4ebe687 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ Author: Kojima Toshiyasu Author URI: http://dogwood.skr.jp/ Requires at least: 3.3 Tested up to: 3.6 -Stable tag: 1.2 +Stable tag: 1.2.1 License: GPLv2 License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -158,6 +158,9 @@ When auto upgrading of SQLite Integration fails, please try manual upgrade via F == Changelog == += 1.2.1 (2013-08-04) = +* Changes following that of the wpdb.php file which makes the plugin compatible with Wordpress 3.6. + = 1.2 (2013-08-03) = * Fixed the date string format and its quotation for calendar widget. * Fixed the patch utility program for using on the Windows machine. diff --git a/sqlite-integration.php b/sqlite-integration.php index 3095b45..677e071 100644 --- a/sqlite-integration.php +++ b/sqlite-integration.php @@ -4,7 +4,7 @@ Plugin Name: SQLite Integration Plugin URI: http://wordpress.org/extend/plugins/sqlite-integration Description: SQLite Integration is the plugin that enables WordPress to use SQLite. If you don't have MySQL and want to build a WordPress website, it's for you. Author: Kojima Toshiyasu -Version: 1.2 +Version: 1.2.1 Author URI: http://dogwood.skr.jp Text Domain: sqlite-integration Domain Path: /languages