From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/lib/classes/json_handler.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/json_handler.inc.php b/interface/lib/classes/json_handler.inc.php
index b435947..9f34522 100644
--- a/interface/lib/classes/json_handler.inc.php
+++ b/interface/lib/classes/json_handler.inc.php
@@ -82,7 +82,11 @@
public function run() {
- $method = reset(array_keys($_GET));
+ if(!isset($_GET) || !is_array($_GET) || count($_GET) < 1) {
+ $this->_return_json('invalid_method', 'Method not provided in json call');
+ }
+ $keys = array_keys($_GET);
+ $method = reset($keys);
$params = array();
if(is_array($_POST)) {
--
Gitblit v1.9.1