1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

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

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

View File

@ -5524,7 +5524,7 @@ class e_admin_ui extends e_admin_controller_ui
$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');
}
@ -5540,7 +5540,7 @@ class e_admin_ui extends e_admin_controller_ui
$this->validationRules = array();
foreach ($this->fields as $key => $att)
{
if(null === varset($att['type']) || vartrue($att['noedit']))
if(null === varset($att['type'], null) || vartrue($att['noedit']))
{
continue;
}

View File

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