Merge branch 'master' into fixing-1354-master

Conflicts:
	settings/admin.php
	settings/templates/admin.php

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/util.php b/lib/util.php
index ae0900d7e84..5f796e7565f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -300,6 +300,8 @@ class OC_Util {
 			$redirect_url = OC_Util::sanitizeHTML($_REQUEST['redirect_url']);
 			$parameters['redirect_url'] = urlencode($redirect_url);
 		}
+
+		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
 		OC_Template::printGuestPage("", "login", $parameters);
 	}
 
@@ -563,6 +565,14 @@ class OC_Util {
 	}
 
 	/**
+	 * Check if the PHP module fileinfo is loaded.
+	 * @return bool
+	 */
+	public static function fileInfoLoaded() {
+		return function_exists('finfo_open');
+	}
+
+	/**
 	 * Check if the ownCloud server can connect to the internet
 	 */
 	public static function isinternetconnectionworking() {