aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-26 20:15:42 -0700
committerredmatrix <git@macgirvin.com>2016-06-26 20:15:42 -0700
commite2de2f65d5f434f800ac9fb6b824f9cbb5f860e8 (patch)
tree8a7661ce547aa252bf943d8f8f990a55d9aac360
parentec3651d216a5eafcb8019825bc6751e6ffa8c198 (diff)
downloadvolse-hubzilla-e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8.tar.gz
volse-hubzilla-e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8.tar.bz2
volse-hubzilla-e2de2f65d5f434f800ac9fb6b824f9cbb5f860e8.zip
issue #442, tables contain too much whitespace (there's a definite issue here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem).
-rw-r--r--include/bbcode.php14
-rw-r--r--include/network.php12
2 files changed, 25 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 0bf326506..7f7be4300 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -498,6 +498,18 @@ function bb_highlight($match) {
return $match[0];
}
+function bb_fixtable_lf($match) {
+
+ // remove extraneous whitespace between table element tags since newlines will all
+ // be converted to '<br />' and turn your neatly crafted tables into a whole lot of
+ // empty space.
+
+ $x = preg_replace("/\]\s+\[/",'][',$match[1]);
+ return '[table]' . $x . '[/table]';
+
+}
+
+
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendica/Redmatrix/Hubzilla - Mike Macgirvin
@@ -579,7 +591,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
$Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text);
}
-
+ $Text = preg_replace_callback("/\[table\](.*?)\[\/table\]/ism",'bb_fixtable_lf',$Text);
// Convert new line chars to html <br /> tags
diff --git a/include/network.php b/include/network.php
index 91dac936e..96bf714f6 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1336,8 +1336,20 @@ function discover_by_webbie($webbie) {
$fullname = $vcard['fn'];
if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0))
$vcard['photo'] = $diaspora_base . '/' . $vcard['photo'];
+ if(($vcard['key']) && (! $pubkey))
+ $pubkey = $vcard['key'];
if(! $avatar)
$avatar = $vcard['photo'];
+ if($diaspora) {
+ if(($vcard['guid']) && (! $diaspora_guid))
+ $diaspora_guid = $vcard['guid'];
+ if(($vcard['url']) && (! $diaspora_base))
+ $diaspora_base = $vcard['url'];
+
+
+
+
+ }
}
}