From 4c7dc368a6bf2a744f0750b592291e9c9c194c32 Mon Sep 17 00:00:00 2001 From: Platonides Date: Fri, 1 Jun 2012 00:13:36 +0200 Subject: [PATCH] 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 --- tests/phpunit/MediaWikiTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.20.1