Thread:Project:Support desk/Patch from 1.23.1 to 1.23.2 Error/reply (2)

I am having the exact same problem. I have the impression that the last bit of the patch file is where the problem lies.

If I remove the following bit of the patch: diff -Nruw -x messages -x '*.png' -x '*.jpg' -x '*.xcf' -x '*.gif' -x '*.svg' -x '*.tiff' -x '*.zip' -x '*.xmp' -x '.git*' mediawiki-1.23.1/tests/phpunit/includes/api/format/ApiFormatJsonTest.php mediawiki-1.23.2/tests/phpunit/includes/api/format/ApiFormatJsonTest.php --- mediawiki-1.23.1/tests/phpunit/includes/api/format/ApiFormatJsonTest.php   2014-07-30 19:29:15.619144417 +0000 +++ mediawiki-1.23.2/tests/phpunit/includes/api/format/ApiFormatJsonTest.php   2014-07-30 19:24:41.560514483 +0000 @@ -14,4 +14,9 @@               $this->assertInternalType( 'array', json_decode( $data, true ) ); $this->assertGreaterThan( 0, count( (array)$data ) ); } + +      public function testJsonpInjection { +              $data = $this->apiRequest( 'json', array( 'action' => 'query', 'meta' => 'siteinfo', 'callback' => 'myCallback' ) ); +              $this->assertEquals( '/**/myCallback(', substr( $data, 0, 15 ) ); +       }

The following happens: patching file includes/api/ApiFormatJson.php patching file includes/db/DatabasePostgres.php patching file includes/DefaultSettings.php patching file includes/ImagePage.php patching file includes/OutputPage.php patching file includes/parser/ParserOutput.php patching file includes/Preferences.php patching file includes/SiteStats.php patching file maintenance/initSiteStats.php patching file RELEASE-NOTES-1.23 patching file resources/Resources.php patching file resources/src/mediawiki.page/mediawiki.page.image.pagination.js Hunk #1 succeeded at 60 with fuzz 1.
 * 1) patch -p1 --dry-run < mediawiki-1.23.2.patch_mod