keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
Tobias Diekershoff 2011-06-11 08:33:02 +02:00
commit 4d3c6941ca
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.2.1006' );
define ( 'FRIENDIKA_VERSION', '2.2.1007' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1063 );

14
include/items.php
View file

@ -1334,6 +1334,17 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
$datarray['author-avatar'] = $contact['thumb'];
}
if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
$ev = bbtoevent($datarray['body']);
if(x($ev,'desc') && x($ev,'start')) {
$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['uid'])
);
// import/update event
}
}
$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['uid'])
@ -1751,4 +1762,5 @@ function item_expire($uid,$days) {
proc_run('php',"include/notifier.php","expire","$uid");
}
}

7
view/theme/duepuntozero/style.css
View file

@ -2459,6 +2459,13 @@ a.mail-list-link {
position: absolute;
left: 0px;
top: 0px;
opacity: 0.3;
filter:alpha(opacity=30);
}
#lang-select-icon:hover {
opacity: 1;
filter:alpha(opacity=100);
}