mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

BC Fix for comment avatar size. Regexp for "makeClickable" now handles ' ' before URL correctly.

Browse Source
This commit is contained in:
Cameron
2016-03-16 09:21:12 -07:00
parent 5348c02223
commit f927e49e22
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/comment_class.php
View File

@@ -481,7 +481,9 @@ class comment
$COMMENT_TEMPLATE['item'] = str_replace("row", "row-fluid", $COMMENT_TEMPLATE['item']); $COMMENT_TEMPLATE['item'] = str_replace("row", "row-fluid", $COMMENT_TEMPLATE['item']);
} }
e107::getParser()->setThumbSize(100,100); // BC FIx. Set a default image size, in case the template doesn't have one.
if (vartrue($pref['nested_comments'])) if (vartrue($pref['nested_comments']))
{ {
// $width2 = 100 - $width; // $width2 = 100 - $width;
@@ -1150,7 +1152,7 @@ class comment
{ {
$comment = $ns->tablerender(COMLAN_9, $comment, 'comment', true ); $comment = $ns->tablerender(COMLAN_9, $comment, 'comment', true );
} }

2
e107_handlers/e_parse_class.php
View File

@@ -1431,7 +1431,7 @@ class e_parse extends e_parser
$linktext = (!empty($textReplace)) ? $textReplace : '\\2'; $linktext = (!empty($textReplace)) ? $textReplace : '\\2';
$external = (!empty($opts['ext'])) ? 'rel="external"' : ''; $external = (!empty($opts['ext'])) ? 'rel="external"' : '';
$text = preg_replace("#(^|[\s])([\w]+?://(?:[\w-%]+?)(?:\.[\w-%]+?)+.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a class=\"e-url\" href=\"\\2\" ".$external.">".$linktext."</a>", $text); $text = preg_replace("#(^|[\s]|&nbsp;)([\w]+?:\/\/(?:[\w-%]+?)(?:\.[\w-%]+?)+.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$|&nbsp;)#is", "\\1<a class=\"e-url\" href=\"\\2\" ".$external.">".$linktext."</a>", $text);
$text = preg_replace("#(^|[\s])((?:www|ftp)(?:\.[\w-%]+?){2}.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a class=\"e-url\" href=\"http://\\2\" ".$external.">".$linktext."</a>", $text); $text = preg_replace("#(^|[\s])((?:www|ftp)(?:\.[\w-%]+?){2}.*?)(?=$|[\s[\]<]|\.\s|\.$|,\s|,$)#is", "\\1<a class=\"e-url\" href=\"http://\\2\" ".$external.">".$linktext."</a>", $text);
break; break;