fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGS 14025 and 14476 IMPROVEMENETS

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-04-10 12:52:13 -04:00
parent 7feaef97f3
commit f0988abb99
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gulliver/system/class.xmlform.php
View File

@@ -1491,7 +1491,10 @@ class XmlForm_Field_Suggest extends XmlForm_Field_SimpleText //by neyek
return $str; return $str;
} }
} else { } else {
return $this->htmlentities( $formVariableValue, ENT_COMPAT, 'utf-8' ); $html = '<span id="form[' . $this->name . ']">';
$html .= $this->htmlentities($formVariableValue, ENT_COMPAT, 'utf-8');
$html .= '</span>';
return $html;
} }
} }
@@ -2629,7 +2632,7 @@ class XmlForm_Field_YesNo extends XmlForm_Field
} }
} else { } else {
//VIEW MODE //VIEW MODE
$html .= '<span id=" ' . $this->name . ' ">'; $html .= '<span id="' . $this->name . '">';
$html .= ($value === '0') ? G::LoadTranslation( 'ID_NO_VALUE' ) : G::LoadTranslation( 'ID_YES_VALUE' ); $html .= ($value === '0') ? G::LoadTranslation( 'ID_NO_VALUE' ) : G::LoadTranslation( 'ID_YES_VALUE' );
$html .= '<input '; $html .= '<input ';
$html .= 'id="form[' . $this->name . ']" '; $html .= 'id="form[' . $this->name . ']" ';

16
workflow/engine/classes/class.pmScript.php
View File

@@ -154,7 +154,9 @@ class PMScript
if (!defined("T_ML_COMMENT")) { if (!defined("T_ML_COMMENT")) {
define("T_ML_COMMENT", T_COMMENT); define("T_ML_COMMENT", T_COMMENT);
} else { } else {
define("T_DOC_COMMENT", T_ML_COMMENT); if (!defined("T_DOC_COMMENT")) {
define("T_DOC_COMMENT", T_ML_COMMENT);
}
} }
$script = "<?php " . $sScript; $script = "<?php " . $sScript;
@@ -163,7 +165,7 @@ class PMScript
foreach ($tokens as $token) { foreach ($tokens as $token) {
if (is_string($token)) { if (is_string($token)) {
$result = $result . $token; $result .= $token;
} else { } else {
list($id, $text) = $token; list($id, $text) = $token;
@@ -173,18 +175,18 @@ class PMScript
case T_COMMENT: case T_COMMENT:
case T_ML_COMMENT: //we've defined this case T_ML_COMMENT: //we've defined this
case T_DOC_COMMENT: //and this case T_DOC_COMMENT: //and this
if ($text != '<?php ' && $text != '<?php' && $text != '<? ' && $text != '<?' && $text != '<% ' && $text != '<%') {
$result .= $text;
}
break; break;
default: default:
$result = $result . $text; $result .= $text;
break; break;
} }
} }
} }
$result = trim($result); $this->sScript = trim($result);
$sScript = $result;
$this->sScript = $sScript;
} }
/** /**