From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 6 Dec 2013 00:26:34 +0000 (+0000)
Subject: Merge "Change line breaks in LocalFile::recordUpload2()"
X-Git-Tag: 1.31.0-rc.0~17754
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=66266d776157572731c4d49531cdbb9479b554ec;hp=3deea6ed33cb378d1325b3f4d670a96edf98b238;p=lhc%2Fweb%2Fwiklou.git

Merge "Change line breaks in LocalFile::recordUpload2()"
---

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index dd8e38aacb..5206447c39 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1220,8 +1220,8 @@ class LocalFile extends File {
 	 * @param null|User $user
 	 * @return bool
 	 */
-	function recordUpload2(
-		$oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null
+	function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false,
+		$user = null
 	) {
 		wfProfileIn( __METHOD__ );