summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-08-28 09:08:37 +0200
committerPierre Schmitz <pierre@archlinux.de>2014-08-28 09:08:37 +0200
commit8ca31c4bfc61c8d99eda1cee307ff4de22897708 (patch)
treef6eaa6b4447bbfd26ad61fdb2b66b38bc17a5f23 /includes
parent027fc6e70f7f9ce8422d4798fb02e67ff271ae4c (diff)
Update to MediaWiki 1.22.10
Diffstat (limited to 'includes')
-rw-r--r--includes/DefaultSettings.php2
-rw-r--r--includes/db/DatabaseOracle.php4
2 files changed, 5 insertions, 1 deletions
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cd631a8b..b2c12001 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -63,7 +63,7 @@ $wgConf = new SiteConfiguration;
* MediaWiki version number
* @since 1.2
*/
-$wgVersion = '1.22.9';
+$wgVersion = '1.22.10';
/**
* Name of the site. It must be changed in LocalSettings.php
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index fb2d4359..9009b328 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1304,6 +1304,10 @@ class DatabaseOracle extends DatabaseBase {
throw new DBUnexpectedError( $this, "Cannot create LOB descriptor: " . $e['message'] );
}
+ if ( is_object( $val ) ) {
+ $val = $val->getData();
+ }
+
if ( $col_type == 'BLOB' ) {
$lob[$col]->writeTemporary( $val );
oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, SQLT_BLOB );