mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Reverted "Fix for non Latin characters in textareas " - blank content. Admin-ui notice check fix.

Browse Source
This commit is contained in:
Cameron
2016-02-17 11:15:47 -08:00
parent 04a59f8bc9
commit 9f0007acdb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/admin_ui.php
View File

@@ -5524,7 +5524,7 @@ class e_admin_ui extends e_admin_controller_ui
$att['data'] = 'set'; $att['data'] = 'set';
} }
if(($key !== 'options' && false !== varset($att['data']) && null !== varset($att['type']) && !vartrue($att['noedit'])) || vartrue($att['forceSave'])) if(($key !== 'options' && false !== varset($att['data']) && null !== varset($att['type'],null) && !vartrue($att['noedit'])) || vartrue($att['forceSave']))
{ {
$this->dataFields[$key] = vartrue($att['data'], 'str'); $this->dataFields[$key] = vartrue($att['data'], 'str');
} }
@@ -5540,7 +5540,7 @@ class e_admin_ui extends e_admin_controller_ui
$this->validationRules = array(); $this->validationRules = array();
foreach ($this->fields as $key => $att) foreach ($this->fields as $key => $att)
{ {
if(null === varset($att['type']) || vartrue($att['noedit'])) if(null === varset($att['type'], null) || vartrue($att['noedit']))
{ {
continue; continue;
} }

2
e107_handlers/e_parse_class.php
View File

@@ -4141,7 +4141,7 @@ return;
// libxml_use_internal_errors(true); // hides errors. // libxml_use_internal_errors(true); // hides errors.
$doc = $this->domObj; $doc = $this->domObj;
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
@$doc->loadHTML($html, 'HTML-ENTITIES', 'UTF-8'); @$doc->loadHTML($html);
// $doc->encoding = 'UTF-8'; // $doc->encoding = 'UTF-8';
// $doc->resolveExternals = true; // $doc->resolveExternals = true;