Merge pull request #2 from xpressengine/develop

Develop
xpressengine · Feb 14, 2014 · e0eef37 · e0eef37
2 parents 7e6bf6f + 25f382d
commit e0eef37
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
@@ -45,8 +45,12 @@ function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $
 		$oContext = Context::getInstance();
 		if($oContext->isSuccessInit == FALSE)
 		{
-			$this->error = 'msg_invalid_request';
-			return;
+			$logged_info = Context::get('logged_info');
+			if($logged_info->is_admin != "Y")
+			{
+				$this->error = 'msg_invalid_request';
+				return;
+			}
 		}
 
 		// Set variables from request arguments

diff --git a/common/js/common.js b/common/js/common.js
@@ -59,9 +59,9 @@ if(jQuery) jQuery.noConflict();
 			if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap;
 
 			if(options.wrap) {
-				obj = $(options.wrap).find('input[name='+itemName+']:checkbox');
+				obj = $(options.wrap).find('input[name="'+itemName+'"]:checkbox');
 			} else {
-				obj = $('input[name='+itemName+']:checkbox');
+				obj = $('input[name="'+itemName+'"]:checkbox');
 			}
 
 			if(options.checked == 'toggle') {

diff --git a/common/js/xe.js b/common/js/xe.js
@@ -58,9 +58,9 @@ if(jQuery) jQuery.noConflict();
 			if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap;
 
 			if(options.wrap) {
-				obj = $(options.wrap).find('input[name='+itemName+']:checkbox');
+				obj = $(options.wrap).find('input[name="'+itemName+'"]:checkbox');
 			} else {
-				obj = $('input[name='+itemName+']:checkbox');
+				obj = $('input[name="'+itemName+'"]:checkbox');
 			}
 
 			if(options.checked == 'toggle') {

diff --git a/common/js/xe.min.js b/common/js/xe.min.js