From 4d45a81fdb0686bfcb21c9849b2da4bf2248a5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 9 Mar 2015 15:30:52 -0400
Subject: [PATCH] closes #2383

---
 public/src/ajaxify.js | 12 +++++++-----
 src/views/500.tpl     |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 865626635c..5e26619253 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -89,11 +89,9 @@ $(document).ready(function() {
 				app.previousUrl = url;
 				return ajaxify.go('login');
 			} else if (status === 302) {
-				if (data.responseJSON.path) {
-					if (!ajaxify.go(data.responseJSON.path, callback, quiet)) {
-						window.location.href = data.responseJSON.path;
-					}
-				} else if (data.responseJSON) {
+				if (data.responseJSON.external && data.responseJSON.path) {
+					window.location.href = data.responseJSON.path;
+				} else if (typeof data.responseJSON === 'string') {
 					ajaxify.go(data.responseJSON.slice(1), callback, quiet);
 				}
 			}
@@ -184,6 +182,9 @@ $(document).ready(function() {
 				}
 			},
 			error: function(data, textStatus) {
+				if (data.status === 0 && textStatus === 'error') {
+					data.status = 500;
+				}
 				callback({
 					data: data,
 					textStatus: textStatus
@@ -264,5 +265,6 @@ $(document).ready(function() {
 
 	ajaxifyAnchors();
 	app.load();
+	templates.cache['500'] = $('.tpl-500').html();
 
 });
\ No newline at end of file
diff --git a/src/views/500.tpl b/src/views/500.tpl
index 13b0e9de89..6408fbb79d 100644
--- a/src/views/500.tpl
+++ b/src/views/500.tpl
@@ -1,7 +1,7 @@
 <div class="alert alert-danger">
 	<strong>[[global:500.title]]</strong>
 	<p>[[global:500.message]]</p>
-	<p>{path}<p>
+	<p>{path}</p>
 	<!-- IF error --><p>{error}</p><!-- ENDIF error -->
 
-</div>
\ No newline at end of file
+</div>