From: Platonides <platonides@gmail.com>
Date: Thu, 31 May 2012 22:13:36 +0000 (+0200)
Subject: The 4th Database::select() parameter is the function name.
X-Git-Tag: 1.31.0-rc.0~23453^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=4c7dc368a6bf2a744f0750b592291e9c9c194c32;p=lhc%2Fweb%2Fwiklou.git

The 4th Database::select() parameter is the function name.
The ORDER BY should be at $options.
This was throwing errors in PHP 5.4 due to the array being
converted to a string down at Database.php:862

Fixes 50ee1d2

Change-Id: Ifb0fc70144242f25fc916fb8d380ed3e2d334fb9
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 8c6a411e21..37297968fd 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -366,7 +366,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 
 		$db = wfGetDB( DB_SLAVE );
 
-		$res = $db->select( $table, $fields, $condition, array( 'ORDER BY' => $fields ) );
+		$res = $db->select( $table, $fields, $condition, wfGetCaller(), array( 'ORDER BY' => $fields ) );
 		$this->assertNotEmpty( $res, "query failed: " . $db->lastError() );
 
 		$i = 0;