aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-23 18:50:18 -0700
committerFriendika <info@friendika.com>2011-08-23 18:50:18 -0700
commitc1acea330c7c497f85c587e5499718d170272040 (patch)
tree4f73ef4796530f65fb5aa9630871482e76da574d
parent3b4da00495f17fd937ebdfc14b52106ac4d9a5f3 (diff)
downloadvolse-hubzilla-c1acea330c7c497f85c587e5499718d170272040.tar.gz
volse-hubzilla-c1acea330c7c497f85c587e5499718d170272040.tar.bz2
volse-hubzilla-c1acea330c7c497f85c587e5499718d170272040.zip
photo fixes
-rw-r--r--include/bb2diaspora.php2
-rw-r--r--include/diaspora.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 3baba8a9e..5ce34d666 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -39,7 +39,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.*?)\[/url\])", '[$2]($1)', $Text);
// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text);
- $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
+// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
// Perform MAIL Search
$Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text);
diff --git a/include/diaspora.php b/include/diaspora.php
index a1edd08a6..00bf1f910 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -907,12 +907,12 @@ function diaspora_send_status($item,$owner,$contact) {
foreach($matches as $mtch) {
$detail = array();
$detail['str'] = $mtch[0];
- $detail['path'] = dirname($mtch[1]);
+ $detail['path'] = dirname($mtch[1]) . '/';
$detail['file'] = basename($mtch[1]);
$detail['guid'] = $item['guid'];
$detail['handle'] = $myaddr;
$images[] = $detail;
- $body = str_replace($detail['str'],'',$body);
+ $body = str_replace($detail['str'],t('link to photo'),$body);
}
}
@@ -931,7 +931,7 @@ function diaspora_send_status($item,$owner,$contact) {
'$created' => $created
));
- logger('diaspora_send_status: base message: ' . $msg, LOGGER_DATA);
+ logger('diaspora_send_status: ' . $owner['username'] . ' -> ' . $contact['name'] . ' base message: ' . $msg, LOGGER_DATA);
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));