Fixes elgg.session.cookie() support of Date() for expires

1 files changed, 12 insertions, 15 deletions

diff --git a/js/lib/session.js b/js/lib/session.js
index fa3d60aa9..0fc7f5c87 100644
--- a/js/lib/session.js
+++ b/js/lib/session.js
@@ -47,21 +47,18 @@ elgg.session.cookie = function (name, value, options) {
 	}
 	
 	cookies.push(name + '=' + value);
-	
-	if (elgg.isNumber(options.expires)) {
-		if (elgg.isNumber(options.expires)) {
-			date = new Date();
-			date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
-		} else if (options.expires.toUTCString) {
-			date = options.expires;
-		} else {
-			valid = false;
-		}
-		
-		if (valid) {
-			cookies.push('expires=' + date.toUTCString());
-		}
-	}
+
+    if (elgg.isNumber(options.expires)) {
+        date = new Date();
+        date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+    } else if (options.expires.toUTCString) {
+        date = options.expires;
+    }
+
+    if (date) {
+        cookies.push('expires=' + date.toUTCString());
+    }
+
 	
 	// CAUTION: Needed to parenthesize options.path and options.domain
 	// in the following expressions, otherwise they evaluate to undefined