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

Merge branch 'master' of github.com:e107inc/e107

Browse Source
This commit is contained in:
SecretR
2016-01-15 13:50:50 +02:00
parent a609a899cc 169faeee04
commit 0ec4a37bcb
149 changed files with 1089 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/e_parse_class.php
View File

@@ -1455,7 +1455,7 @@ class e_parse extends e_parser
if($opts['defs'] && (strlen($text) < 35) && ((strpos($text, '::') === FALSE) && defined(trim($text))))
{
return constant(trim($text));
$text = constant(trim($text)); // don't return yet, words could be hooked with linkwords etc.
}
if ($opts['no_tags'])
@@ -2841,8 +2841,8 @@ class e_parser
protected $allowedTags = array('html', 'body','div','a','img','table','tr', 'td', 'th', 'tbody', 'thead', 'colgroup', 'b',
'i', 'pre','code', 'strong', 'u', 'em','ul', 'ol', 'li','img','h1','h2','h3','h4','h5','h6','p',
'div','pre','section','article', 'blockquote','hgroup','aside','figure','span', 'audio', 'video', 'br',
'small', 'caption', 'noscript', 'hr'
'div','pre','section','article', 'blockquote','hgroup','aside','figure','figcaption', 'abbr','span', 'audio', 'video', 'br',
'small', 'caption', 'noscript', 'hr', 'section'
);
protected $scriptTags = array('script','applet','iframe','form','input','button'); //allowed when $pref['post_script'] is enabled.