tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-09-05 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/module_manager_editor_plugin.php,
	include/javascript/pandora_modules.js: fixed the double apply
	entities in the plugin components.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8745 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-09-05 12:34:03 +00:00
parent 172fc500ec
commit 361ed9b69d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_plugin.php,
include/javascript/pandora_modules.js: fixed the double apply
entities in the plugin components.
2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_filemanager.php: fixed PHP notice when this

8
pandora_console/godmode/agentes/module_manager_editor_plugin.php
View File

@ -75,13 +75,13 @@ $table_simple->rowstyle['macro_field'] = 'display:none';
push_table_simple ($data, 'macro_field');
// If there are $macros, we create the form fields
if(!empty($macros)) {
if (!empty($macros)) {
$macros = json_decode($macros, true);
foreach($macros as $k => $m) {
foreach ($macros as $k => $m) {
$data = array ();
$data[0] = $m['desc'];
if(!empty($m['help'])) {
if (!empty($m['help'])) {
$data[0] .= ui_print_help_tip ($m['help'], true);
}
$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true);

2
pandora_console/include/javascript/pandora_modules.js
View File

@ -547,7 +547,7 @@ function add_macro_field(macro, row_model_id) {
// Change the carriage returns by html returns <br> in help
var macro_help = macro['help'].replace(/&#x0d;/g,"<br>");
var macro_macro = macro['macro'];
var macro_value = macro['value'];
var macro_value = $('<div />').html(macro['value']).text();;
var row_id = row_model_id + macro_macro;