diff --git a/adult_smile/icons/drunk.gif b/adult_smile/icons/drunk.gif new file mode 100644 index 000000000..4a1c064a7 Binary files /dev/null and b/adult_smile/icons/drunk.gif differ diff --git a/adult_smile/icons/sperm.gif b/adult_smile/icons/sperm.gif new file mode 100644 index 000000000..6ba921900 Binary files /dev/null and b/adult_smile/icons/sperm.gif differ diff --git a/dwpost.tgz b/dwpost.tgz index ecbb5198f..c0fbb96bd 100644 Binary files a/dwpost.tgz and b/dwpost.tgz differ diff --git a/facebook.tgz b/facebook.tgz index 783425ced..b1db063bb 100644 Binary files a/facebook.tgz and b/facebook.tgz differ diff --git a/facebook/facebook.php b/facebook/facebook.php index 4524a4865..9c8c8f085 100755 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -1174,7 +1174,7 @@ function fb_consume_stream($uid,$j,$wall = false) { if($entry->privacy && $entry->privacy->value !== 'EVERYONE') { $datarray['private'] = 1; - $datarray['allow_cid'] = '<' . $uid . '>'; + $datarray['allow_cid'] = '<' . $self[0]['id'] . '>'; } if(trim($datarray['body']) == '') { diff --git a/irc.tgz b/irc.tgz index 999c8d212..e10b0769e 100644 Binary files a/irc.tgz and b/irc.tgz differ diff --git a/irc/irc.php b/irc/irc.php index cf86a446e..1e0519509 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -6,6 +6,11 @@ * Author: tony baldwin */ +/* enable in admin->plugins + * you will then have "irc chatroom" listed at yoursite/apps + * and the app will run at yoursite/irc + * documentation at http://tonybaldwin.me/hax/doku.php?id=friendica:irc + */ function irc_install() { register_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); @@ -32,10 +37,13 @@ $baseurl = $a->get_baseurl() . '/addon/irc'; $o = ''; - // add the chatroom frame and some html +/* add the chatroom frame and some html + * by altering the "channels=friendica" part of the URL, you can add/remove channels. + * At free-haven.org, I have "?channels=friendica,free-haven", for instance, to open #friendica and #free-haven + */ $o .= <<< EOT

IRC chat

-

a beginner's guid to using IRC.

+

a beginner's guide to using IRC.

EOT; diff --git a/ljpost.tgz b/ljpost.tgz index 21ec1915e..840e2ee2a 100644 Binary files a/ljpost.tgz and b/ljpost.tgz differ