From 1a579b23a22489a9a9a3943a36c410d42513d51f Mon Sep 17 00:00:00 2001 From: Platonides Date: Sun, 7 Feb 2010 16:26:17 +0000 Subject: [PATCH] Fix at least the url and entities. --- maintenance/importImages.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maintenance/importImages.inc b/maintenance/importImages.inc index 61baf7c415..0f335ee277 100644 --- a/maintenance/importImages.inc +++ b/maintenance/importImages.inc @@ -91,22 +91,22 @@ function findAuxFile( $file, $auxExtension, $maxStrip = 1 ) { # FIXME: Access the api in a saner way and performing just one query (preferably batching files too). function getFileCommentFromSourceWiki($wiki_host, $file) { - $url = $wiki_host . '/api.php?action=query&format=xml&titles=File:' . $file . '&prop=imageinfo&&iiprop=comment'; + $url = $wiki_host . '/api.php?action=query&format=xml&titles=File:' . rawurlencode( $file ) . '&prop=imageinfo&&iiprop=comment'; $body = file_get_contents($url); if (preg_match('##', $body, $matches) == 0) { return false; } - return $matches[1]; + return html_entity_decode( $matches[1] ); } function getFileUserFromSourceWiki($wiki_host, $file) { - $url = $wiki_host . '/api.php?action=query&format=xml&titles=File:' . $file . '&prop=imageinfo&&iiprop=user'; + $url = $wiki_host . '/api.php?action=query&format=xml&titles=File:' . rawurlencode( $file ) . '&prop=imageinfo&&iiprop=user'; $body = file_get_contents($url); if (preg_match('##', $body, $matches) == 0) { return false; } - return $matches[1]; + return html_entity_decode( $matches[1] ); } -- 2.20.1