From 8ca31c4bfc61c8d99eda1cee307ff4de22897708 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 28 Aug 2014 09:08:37 +0200
Subject: Update to MediaWiki 1.22.10

---
 RELEASE-NOTES-1.22             | 18 ++++++++++++++++++
 includes/DefaultSettings.php   |  2 +-
 includes/db/DatabaseOracle.php |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 44067ff8..3479fbca 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -3,6 +3,24 @@
 Security reminder: MediaWiki does not require PHP's register_globals. If you
 have it on, turn it '''off''' if you can.
 
+== MediaWiki 1.22.10 ==
+
+This is a maintenance release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.9 ===
+
+* (bug 64970) Fix support for blobs on DatabaseOracle::update
+* (bug 60719) In MediaWiki 1.22, the job queue execution on each page
+  request was changed (Gerrit change 59797) so, instead of executing
+  the job inside the same PHP process that's rendering the page, a new
+  PHP cli command is spawned to execute runJobs.php in the
+  background. It will only work if $wgPhpCli is set to an actual path
+  or safe mode is off, otherwise, the old method will be used.
+
+  https://www.mediawiki.org/wiki/Manual:Job_queue#Changes_introduced_in_MediaWiki_1.22
+  for more infomation.  This change was in earlier releases of 1.22
+  but was not noted here until now.
+
 == MediaWiki 1.22.9 ==
 
 This is a security and maintenance release of the MediaWiki 1.22 branch.
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 );
-- 
cgit v1.2.3-54-g00ecf