Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Thomas 2012-03-19 03:34:54 +00:00
commit 760abc1593
8 changed files with 11 additions and 3 deletions

BIN
adult_smile/icons/drunk.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 648 B

BIN
adult_smile/icons/sperm.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Binary file not shown.

View file

@ -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']) == '') {

BIN
irc.tgz

Binary file not shown.

View file

@ -6,6 +6,11 @@
* Author: tony baldwin <https://free-haven.org/profile/tony>
*/
/* 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
<h2>IRC chat</h2>
<p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">a beginner's guid to using IRC.</a></p>
<p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">a beginner's guide to using IRC.</a></p>
<iframe src="http://webchat.freenode.net?channels=friendica" width="600" height="600"></iframe>
EOT;

Binary file not shown.