From b1badda213261e3fe4ca5dd056e07855db791a19 Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Tue, 15 Oct 2013 13:52:16 +0000
Subject: [PATCH] 2013-10-15  Ramon Novoa  <rnovoa@artica.es>

	* godmode/agentes/module_manager_editor.php: Fixed the module macro
	  editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8916 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                                 | 5 +++++
 pandora_console/godmode/agentes/module_manager_editor.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3c3f70f874..1d808ceef3 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-15  Ramon Novoa  <rnovoa@artica.es>
+
+	* godmode/agentes/module_manager_editor.php: Fixed the module macro
+	  editor.
+
 2013-10-15  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandoradb_data.sql: Fixed some SQL queries.
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index bf399c6a80..8babb9a15c 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -233,7 +233,7 @@ if ($id_agent_module) {
 	
 	$module_macros = null;
 	if (isset($module['module_macros'])) {
-		$module_macros = json_decode(base64_decode($module['module_macros']));
+		$module_macros = json_decode(base64_decode($module['module_macros']), true);
 	}
 }
 else {