summaryrefslogtreecommitdiff
path: root/includes/filerepo
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-01-12 13:42:29 +0100
committerPierre Schmitz <pierre@archlinux.de>2012-01-12 13:42:29 +0100
commitba0fc4fa20067528effd4802e53ceeb959640825 (patch)
tree4f62217349d3afa39dbba3f7e19dac0aecb344f6 /includes/filerepo
parentca32f08966f1b51fcb19460f0996bb0c4048e6fe (diff)
Update to MediaWiki 1.18.1
Diffstat (limited to 'includes/filerepo')
-rw-r--r--includes/filerepo/File.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 6b35102b..1fd6d452 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -117,7 +117,7 @@ abstract class File {
*
* @param $old File Old file
* @param $new string New name
- *
+ *
* @return bool|null
*/
static function checkExtensionCompatibility( File $old, $new ) {
@@ -217,7 +217,7 @@ abstract class File {
public function getFullUrl() {
return wfExpandUrl( $this->getUrl(), PROTO_RELATIVE );
}
-
+
public function getCanonicalUrl() {
return wfExpandUrl( $this->getUrl(), PROTO_CANONICAL );
}
@@ -475,7 +475,7 @@ abstract class File {
/**
* Accessor for __get()
- *
+ *
* @return bool
*/
protected function getIsSafeFile() {
@@ -891,10 +891,10 @@ abstract class File {
/**
* Get the relative path for an archived file
- *
+ *
* @param $suffix bool|string if not false, the name of an archived thumbnail file
*
- * @return string
+ * @return string
*/
function getArchiveRel( $suffix = false ) {
$path = 'archive/' . $this->getHashPath();
@@ -909,7 +909,7 @@ abstract class File {
/**
* Get the relative path for an archived file's thumbs directory
* or a specific thumb if the $suffix is given.
- *
+ *
* @param $archiveName string the timestamped name of an archived image
* @param $suffix bool|string if not false, the name of a thumbnail file
*/