From 6c5e99171e7603bc410fd1010e98bbc8e607f25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Tue, 6 Feb 2018 14:34:49 -0500
Subject: [PATCH] closes #6309

---
 src/upgrade.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/upgrade.js b/src/upgrade.js
index f30a5f43d4..89541ec9f2 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -33,7 +33,13 @@ Upgrade.getAll = function (callback) {
 				versionA = path.dirname(a).split('/').pop();
 				versionB = path.dirname(b).split('/').pop();
 
-				return semver.compare(versionA, versionB);
+				var semverCompare = semver.compare(versionA, versionB);
+				if (semverCompare) {
+					return semverCompare;
+				}
+				var timestampA = require(a).timestamp;
+				var timestampB = require(b).timestamp;
+				return timestampA - timestampB;
 			}));
 		},
 		async.apply(Upgrade.appendPluginScripts),