summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/php/src/index.php6
-rwxr-xr-xfrontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js12
2 files changed, 9 insertions, 9 deletions
diff --git a/backend/php/src/index.php b/backend/php/src/index.php
index 35752f4..58c10a9 100644
--- a/backend/php/src/index.php
+++ b/backend/php/src/index.php
@@ -725,5 +725,5 @@ error_log("message");
725 $result["error"] = "Wrong shared secret!"; 725 $result["error"] = "Wrong shared secret!";
726 } else { 726 } else {
727 $result["result"] = "EXCEPTION"; 727 $result["result"] = "EXCEPTION";
728 $result["message"] = "Trying to communicate without an active connection"; 728 $result["message"] = "Trying to communicate without an active connection";
729 } 729 }
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index 6a4f637..6185fd6 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -240,8 +240,8 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
240 deferredResult.addCallback(MochiKit.Async.evalJSONRequest); 240 deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
241 deferredResult.addCallback(function (someValues) { 241 deferredResult.addCallback(function (someValues) {
242 if (someValues['result'] == 'EXCEPTION') { 242 if (someValues['result'] == 'EXCEPTION') {
243 throw someValues['message']; 243 throw someValues['message'];
244 } 244 }
245 return someValues; 245 return someValues;
246 }) 246 })
247 deferredResult.callback(); 247 deferredResult.callback();