Merge branch 'master' of git://github.com/shish/shimmie2
This commit is contained in:
commit
f96a815288
@ -99,6 +99,8 @@ class BBCode extends FormatterExtension {
|
||||
$end = strpos($text, "[/spoiler]");
|
||||
if($end === false) break;
|
||||
|
||||
if($end < $start) break;
|
||||
|
||||
$beginning = substr($text, 0, $start);
|
||||
$middle = str_rot13(substr($text, $start+$l1, ($end-$start-$l1)));
|
||||
$ending = substr($text, $end + $l2, (strlen($text)-$end+$l2));
|
||||
@ -124,6 +126,8 @@ class BBCode extends FormatterExtension {
|
||||
$end = strpos($text, "[/code]", $start);
|
||||
if($end === false) break;
|
||||
|
||||
if($end < $start) break;
|
||||
|
||||
$beginning = substr($text, 0, $start);
|
||||
$middle = base64_encode(substr($text, $start+$l1, ($end-$start-$l1)));
|
||||
$ending = substr($text, $end + $l2, (strlen($text)-$end+$l2));
|
||||
|
@ -292,7 +292,7 @@ class TagList extends Extension {
|
||||
ORDER BY count DESC, tag ASC
|
||||
", array("tags_min"=>$tags_min));
|
||||
|
||||
$html = "Results grouped by log<sub>e</sub>(n)";
|
||||
$html = "Results grouped by log<sub>10</sub>(n)";
|
||||
$lastLog = "";
|
||||
foreach($tag_data as $row) {
|
||||
$h_tag = html_escape($row['tag']);
|
||||
|
Loading…
x
Reference in New Issue
Block a user