diff --git a/blogger/blogger.php b/blogger/blogger.php
index 8d60472c..852f1fc6 100755
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('Blogger') . '
';
+ $s .= '
' . t('Blogger Export') . '
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('Blogger') . '
';
+ $s .= '
' . t('Blogger Export') . '
';
$s .= '';
$s .= '
';
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index ef8ff51b..c9eb337d 100755
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -144,11 +144,11 @@ function diaspora_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
';
@@ -263,7 +263,7 @@ function fromgplus_handleattachments($item, $displaytext) {
break;
case "article":
- $post .= "\n\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+ $post .= "\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
//if ($images["preview"] != "")
diff --git a/libertree/libertree.php b/libertree/libertree.php
index dec85ddb..b064c6bc 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('libertree') . '
';
+ $s .= '
' . t('libertree Export') . '
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('libertree') . '
';
+ $s .= '
' . t('libertree Export') . '
';
$s .= '';
$s .= '
';
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 1fa6c5e6..b7c8fc7a 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -288,11 +288,11 @@ function privacy_image_cache_img_cb($matches) {
// if the picture seems to be from another picture cache then take the original source
$queryvar = privacy_image_cache_parse_query($matches[2]);
- if ($queryvar['url'] != "")
+ if (($queryvar['url'] != "") AND (substr($queryvar['url'], 0, 4) == "http"))
$matches[2] = urldecode($queryvar['url']);
// if fetching facebook pictures don't fetch the thumbnail but the big one
- if (strpos($matches[2], ".fbcdn.net/") and (substr($matches[2], -6) == "_s.jpg"))
+ if (((strpos($matches[2], ".fbcdn.net/") OR strpos($matches[2], "/fbcdn-photos-"))) and (substr($matches[2], -6) == "_s.jpg"))
$matches[2] = substr($matches[2], 0, -6)."_n.jpg";
// following line changed per bug #431
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 0280b517..1575f14b 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('Pump.io') . '
';
+ $s .= '
' . t('Pump.io Import/Export/Mirror') . '
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('Pump.io') . '
';
+ $s .= '
' . t('Pump.io Import/Export/Mirror') . '
';
$s .= '';
$s .= '
';
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 114fcc5b..06da4393 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . t('Tumblr') . '
';
+ $s .= '
' . t('Tumblr Export') . '
';
$s .= '';
$s .= '
';
$s .= '';
- $s .= '
' . t('Tumblr') . '
';
+ $s .= '
' . t('Tumblr Export') . '
';
$s .= '';
$s .= '
';
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 3c7c17b1..ac856623 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '';
- $s .= '