From eb6bf7e7fad9877e25eda1cbf4f6d0044b984341 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 25 Jun 2012 18:42:18 -0400 Subject: [PATCH 1/2] fix margin of wall-item-body Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 2 +- view/theme/dispy/dark/style.less | 2 +- view/theme/dispy/light/style.css | 2 +- view/theme/dispy/light/style.less | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 6551d9a93..a7763ecfb 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;} .wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;} .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;} -.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} +.wall-item-body{margin:1em;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 5e6883964..32b9aa4b3 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -1429,7 +1429,7 @@ nav #nav-notifications-linkmenu { margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; + margin: 1em; text-align: left; overflow-x: auto; } diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 793feb6fc..3d44cc8c4 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;} .wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;} .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;} -.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} +.wall-item-body{margin:1em;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 13f296d22..c5641605e 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -1430,7 +1430,7 @@ nav #nav-notifications-linkmenu { margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; + margin: 1em; text-align: left; overflow-x: auto; } From 939ebe16f82f4aca9b4d0cf70960fe6495fae49c Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 25 Jun 2012 18:49:36 -0400 Subject: [PATCH 2/2] fix typo and syntax error Signed-off-by: Simon L'nu --- include/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 38d1e658f..36d480a17 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -162,7 +162,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // handle nested lists $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, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) { $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
    $1
' ,$Text);