Merge branch 'master' into fixing-1424-master

Conflicts:
	settings/js/users.js

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/request.php b/lib/request.php
index 1661a1406ca..3c668b02c5f 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -149,4 +149,16 @@ class OC_Request {
 			return 'gzip';
 		return false;
 	}
+	
+	/**
+	 * @brief Check if the requester sent along an mtime
+	 * @returns false or an mtime
+	 */
+	static public function hasModificationTime () {
+		if (isset($_SERVER['HTTP_X_OC_MTIME'])) {
+			return $_SERVER['HTTP_X_OC_MTIME'];
+		} else {
+			return false;
+		}
+	}
 }