tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #366 from fermionic/fix-big-monster-list-logic

Browse source 
fix logic for nested lists--should be OR, not AND
This commit is contained in:
fermionic 2012-06-27 20:24:18 -07:00
parent 3968e71d4c cd9ce0ecb3
commit 26156e1dc4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/bb2diaspora.php
View file

@ -113,9 +113,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
// to define the closing tag for the list elements. So nested lists // to define the closing tag for the list elements. So nested lists
// are going to be flattened out in Diaspora for now // are going to be flattened out in Diaspora for now
$endlessloop = 0; $endlessloop = 0;
while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false) && while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) ||
(strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false) && ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) ||
(strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) { ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false))) && (++$endlessloop < 20)) {
$Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text); $Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text);
$Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text); $Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text);
$Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text); $Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text);

6
include/bbcode.php
View file

@ -163,9 +163,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// handle nested lists // handle nested lists
$endlessloop = 0; $endlessloop = 0;
while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false) && while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) ||
(strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false) && ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) ||
(strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) { ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false))) && (++$endlessloop < 20)) {
$Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text);
$Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text);
$Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text);