james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/shish/shimmie2

Browse Source
This commit is contained in:
jgen 2013-12-08 13:48:33 -05:00
commit f96a815288
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/bbcode/main.php
View File

@ -99,6 +99,8 @@ class BBCode extends FormatterExtension {
$end = strpos($text, "[/spoiler]"); $end = strpos($text, "[/spoiler]");
if($end === false) break; if($end === false) break;
if($end < $start) break;
$beginning = substr($text, 0, $start); $beginning = substr($text, 0, $start);
$middle = str_rot13(substr($text, $start+$l1, ($end-$start-$l1))); $middle = str_rot13(substr($text, $start+$l1, ($end-$start-$l1)));
$ending = substr($text, $end + $l2, (strlen($text)-$end+$l2)); $ending = substr($text, $end + $l2, (strlen($text)-$end+$l2));
@ -124,6 +126,8 @@ class BBCode extends FormatterExtension {
$end = strpos($text, "[/code]", $start); $end = strpos($text, "[/code]", $start);
if($end === false) break; if($end === false) break;
if($end < $start) break;
$beginning = substr($text, 0, $start); $beginning = substr($text, 0, $start);
$middle = base64_encode(substr($text, $start+$l1, ($end-$start-$l1))); $middle = base64_encode(substr($text, $start+$l1, ($end-$start-$l1)));
$ending = substr($text, $end + $l2, (strlen($text)-$end+$l2)); $ending = substr($text, $end + $l2, (strlen($text)-$end+$l2));

2
ext/tag_list/main.php
View File

@ -292,7 +292,7 @@ class TagList extends Extension {
ORDER BY count DESC, tag ASC ORDER BY count DESC, tag ASC
", array("tags_min"=>$tags_min)); ", array("tags_min"=>$tags_min));
$html = "Results grouped by log<sub>e</sub>(n)"; $html = "Results grouped by log<sub>10</sub>(n)";
$lastLog = ""; $lastLog = "";
foreach($tag_data as $row) { foreach($tag_data as $row) {
$h_tag = html_escape($row['tag']); $h_tag = html_escape($row['tag']);