From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 15 May 2014 15:06:19 +0000 (+0000)
Subject: Merge "Added unicode encoding support flags to FileBackend"
X-Git-Tag: 1.31.0-rc.0~15705
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=7fa77c2d52a8aa5c7c6fe7fd7af27770f1ecad12;p=lhc%2Fweb%2Fwiklou.git

Merge "Added unicode encoding support flags to FileBackend"
---

7fa77c2d52a8aa5c7c6fe7fd7af27770f1ecad12
diff --cc includes/upload/UploadBase.php
index bef80be2eb,8071ad15c3..b32780f7ec
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@@ -847,11 -799,12 +847,13 @@@ abstract class UploadBase 
  			return $this->mTitle;
  		}
  
- 		// Windows may be broken with special characters, see bug XXX
- 		if ( wfIsWindows() && !preg_match( '/^[\x0-\x7f]*$/', $nt->getText() ) ) {
+ 		// Windows may be broken with special characters, see bug 1780
+ 		if ( !preg_match( '/^[\x0-\x7f]*$/', $nt->getText() )
+ 			&& !RepoGroup::singleton()->getLocalRepo()->backendSupportsUnicodePaths()
+ 		) {
  			$this->mTitleError = self::WINDOWS_NONASCII_FILENAME;
  			$this->mTitle = null;
 +
  			return $this->mTitle;
  		}