mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

notice removal (not sure if casued by obsolete preference - see the commment)

Browse Source
This commit is contained in:
secretr
2010-10-27 11:23:54 +00:00
parent 0431fd5089
commit 6424eaafdd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_handlers/e_parse_class.php
View File

@@ -463,7 +463,7 @@ class e_parse
*/ */
public function toDB($data, $nostrip = FALSE, $no_encode = FALSE, $mod = FALSE, $original_author = FALSE) public function toDB($data, $nostrip = FALSE, $no_encode = FALSE, $mod = FALSE, $original_author = FALSE)
{ {
global $pref; $core_pref = e107::getConfig();
if (is_array($data)) if (is_array($data))
{ {
foreach ($data as $key => $var) foreach ($data as $key => $var)
@@ -482,17 +482,17 @@ class e_parse
if ($mod != 'pReFs') if ($mod != 'pReFs')
{ {
$data = $this->preFilter($data); $data = $this->preFilter($data);
if (!check_class(varset($pref['post_html'], e_UC_MAINADMIN)) || !check_class(varset($pref['post_script'], e_UC_MAINADMIN))) if (!check_class($core_pref->get('post_html', e_UC_MAINADMIN)) || !check_class($core_pref->get('post_script', e_UC_MAINADMIN)))
{ {
$data = $this->dataFilter($data); $data = $this->dataFilter($data);
} }
} }
if (isset($pref['post_html']) && check_class($pref['post_html'])) if (/*$core_pref->is('post_html') && */check_class($core_pref->get('post_html')))
{ {
$no_encode = TRUE; $no_encode = TRUE;
} }
if (is_numeric($original_author) && !check_class($pref['post_html'], '', $original_author)) if (is_numeric($original_author) && !check_class($core_pref->get('post_html'), '', $original_author))
{ {
$no_encode = FALSE; $no_encode = FALSE;
} }
@@ -509,7 +509,8 @@ class e_parse
$ret = preg_replace("/&#(\d*?);/", "&#\\1;", $data); $ret = preg_replace("/&#(\d*?);/", "&#\\1;", $data);
} }
if ((strpos($mod, 'no_php') !== FALSE) || !check_class($pref['php_bbcode'])) // XXX - php_bbcode pref missing?
if ((strpos($mod, 'no_php') !== FALSE) || !check_class($core_pref->get('php_bbcode')))
{ {
$ret = preg_replace("#\[(php)#i", "[\\1", $ret); $ret = preg_replace("#\[(php)#i", "[\\1", $ret);
} }