From 8109f7bbf051473d4743d7ac66a8c1317854de73 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 5 May 2011 17:42:14 +0000
Subject: [PATCH] Moved wfTimestampNow() near other wfTimestamp() functions

---
 includes/GlobalFunctions.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 2c2accce24..93470c10ca 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1849,16 +1849,6 @@ function wfArrayLookup( $a, $b ) {
 	return array_flip( array_intersect( array_flip( $a ), array_keys( $b ) ) );
 }
 
-/**
- * Convenience function; returns MediaWiki timestamp for the present time.
- *
- * @return string
- */
-function wfTimestampNow() {
-	# return NOW
-	return wfTimestamp( TS_MW, time() );
-}
-
 /**
  * Reference-counted warning suppression
  *
@@ -2094,6 +2084,16 @@ function wfTimestampOrNull( $outputtype = TS_UNIX, $ts = null ) {
 	}
 }
 
+/**
+ * Convenience function; returns MediaWiki timestamp for the present time.
+ *
+ * @return string
+ */
+function wfTimestampNow() {
+	# return NOW
+	return wfTimestamp( TS_MW, time() );
+}
+
 /**
  * Check if the operating system is Windows
  *
-- 
2.20.1