From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 31 Mar 2014 19:38:54 +0000 (+0200)
Subject: Merge branch 'master' into type-hinting
X-Git-Tag: v7.0.0alpha2~506^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b061c236dd5730837b567f2c39a19af1617d33c;p=nextcloud-server.git

Merge branch 'master' into type-hinting

Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
---

6b061c236dd5730837b567f2c39a19af1617d33c
diff --cc lib/private/image.php
index e0397ec8a00,c987ce92c3c..f1b8acc41b7
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@@ -34,8 -34,8 +34,8 @@@ class OC_Image 
  
  	/**
  	* @brief Get mime type for an image file.
 -	* @param string|null $filepath The path to a local image file.
 +	* @param string|null $filePath The path to a local image file.
- 	* @returns string The mime type if the it could be determined, otherwise an empty string.
+ 	* @return string The mime type if the it could be determined, otherwise an empty string.
  	*/
  	static public function getMimeTypeForFile($filePath) {
  		// exif_imagetype throws "read error!" if file is less than 12 byte