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

Merged in julceslau/processmaker (pull request #1074)

Browse Source 
PM-795 se visualizan caracteres extras en el texto de un output document con PHP 5.4 SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-27 13:43:21 -04:00
parent 91eb4c830e c13969b5f4
commit f5111cacf2
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gulliver/system/class.g.php
View File

@@ -2918,7 +2918,11 @@ class G
*/ */
public function unhtmlentities ($string) public function unhtmlentities ($string)
{ {
$trans_tbl = get_html_translation_table( HTML_ENTITIES ); if (version_compare(PHP_VERSION, '5.4.0', '<')) {
$trans_tbl = get_html_translation_table( HTML_ENTITIES );
} else {
$trans_tbl = get_html_translation_table( HTML_ENTITIES, ENT_COMPAT, 'ISO-8859-1' );
}
foreach ($trans_tbl as $k => $v) { foreach ($trans_tbl as $k => $v) {
$ttr[$v] = utf8_encode( $k ); $ttr[$v] = utf8_encode( $k );
} }
@@ -4392,9 +4396,9 @@ class G
} elseif (preg_match( '/Firefox/i', $u_agent )) { } elseif (preg_match( '/Firefox/i', $u_agent )) {
$bname = 'Mozilla Firefox'; $bname = 'Mozilla Firefox';
$ub = "Firefox"; $ub = "Firefox";
} elseif ((preg_match( '/Opera/i', $u_agent )) || (preg_match( '/OPR/i', $u_agent ))) { } elseif ((preg_match( '/Opera/i', $u_agent )) || (preg_match( '/OPR/i', $u_agent ))) {
$bname = 'Opera'; $bname = 'Opera';
$ub = "Opera"; $ub = "Opera";
} elseif (preg_match( '/Chrome/i', $u_agent )) { } elseif (preg_match( '/Chrome/i', $u_agent )) {
$bname = 'Google Chrome'; $bname = 'Google Chrome';
$ub = "Chrome"; $ub = "Chrome";
@@ -5324,8 +5328,7 @@ class G
return $arrayData; return $arrayData;
} }
public static function buildFrom($configuration, $from = '') public static function buildFrom($configuration, $from = '') {
{
if (!isset($configuration['MESS_FROM_NAME'])) { if (!isset($configuration['MESS_FROM_NAME'])) {
$configuration['MESS_FROM_NAME'] = ''; $configuration['MESS_FROM_NAME'] = '';
} }
@@ -5536,23 +5539,22 @@ class G
} }
} }
/** /**
* Check the browser compativility * Check the browser compativility
*/ */
public function checkBrowserCompatibility($browser = null, $version = null) public function checkBrowserCompatibility($browser = null, $version = null){
{ if($browser == null || $version == null){
if ($browser == null || $version == null) { $info = G::getBrowser();
$info = G::getBrowser(); $browser = $info['name'];
$browser = $info['name']; $version = $info['version'];
$version = $info['version']; }
} if ((($browser== 'msie') && (($version >= 8) && ($version <= 11))) ||
if ((($browser== 'msie') && (($version >= 8) && ($version <= 11))) ||
(($browser== 'chrome') && ($version >= 26)) || (($browser== 'chrome') && ($version >= 26)) ||
(($browser== 'firefox') && ($version >= 20)) (($browser== 'firefox') && ($version >= 20))
) { ){
return true; return true;
} }
return false; return false;
} }
/* /*