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

Merge pull request #154 from dgz/fix-wordwrap

Browse Source 
Fix issue #62: wordwrap in CSS rather than PHP
This commit is contained in:
Shish 2012-03-03 12:31:29 -08:00
commit a0d8f20dbc
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/bbcode/main.php
View File

@ -25,10 +25,6 @@
class BBCode extends FormatterExtension { class BBCode extends FormatterExtension {
public function format(/*string*/ $text) { public function format(/*string*/ $text) {
global $config;
if($config->get_bool("word_wrap", true)) {
$text = wordwrap($text, 80, " ", true);
}
$text = preg_replace_callback("/(\[img\]https?:\/\/.*?\[\/img\])/s", array($this, "unwrap"), $text); $text = preg_replace_callback("/(\[img\]https?:\/\/.*?\[\/img\])/s", array($this, "unwrap"), $text);
$text = preg_replace_callback("/(\[url=(?:https?|ftp|irc|mailto):\/\/.*?\])/s", array($this, "unwrap"), $text); $text = preg_replace_callback("/(\[url=(?:https?|ftp|irc|mailto):\/\/.*?\])/s", array($this, "unwrap"), $text);
$text = preg_replace_callback("/(\[url\](?:https?|ftp|irc|mailto):\/\/.*?\[\/url\])/s", array($this, "unwrap"), $text); $text = preg_replace_callback("/(\[url\](?:https?|ftp|irc|mailto):\/\/.*?\[\/url\])/s", array($this, "unwrap"), $text);
@ -75,10 +71,6 @@ class BBCode extends FormatterExtension {
} }
public function strip(/*string*/ $text) { public function strip(/*string*/ $text) {
global $config;
if($config->get_bool("word_wrap", true)) {
$text = wordwrap($text, 80, " ", true);
}
$text = preg_replace("/\[b\](.*?)\[\/b\]/s", "\\1", $text); $text = preg_replace("/\[b\](.*?)\[\/b\]/s", "\\1", $text);
$text = preg_replace("/\[i\](.*?)\[\/i\]/s", "\\1", $text); $text = preg_replace("/\[i\](.*?)\[\/i\]/s", "\\1", $text);
$text = preg_replace("/\[u\](.*?)\[\/u\]/s", "\\1", $text); $text = preg_replace("/\[u\](.*?)\[\/u\]/s", "\\1", $text);

1
themes/default/style.css
View File

@ -144,6 +144,7 @@ UL {
margin-right: 16px; margin-right: 16px;
text-align: center; text-align: center;
height: 1%; height: 1%;
word-wrap: break-word;
} }
#body TABLE { #body TABLE {
width: 90%; width: 90%;