diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-11 08:33:02 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-11 08:33:02 +0200 |
| commit | 4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d (patch) | |
| tree | 74205c0f87d9abf2cd2fe80563643bcbf3ab0a8c | |
| parent | eb6666e1563cef91843539d3b98dc4936c4cea1f (diff) | |
| parent | d66056af9d56d86fdb57061c83c9187ea9f51403 (diff) | |
| download | volse-hubzilla-4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d.tar.gz volse-hubzilla-4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d.tar.bz2 volse-hubzilla-4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/items.php | 14 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 7 |
3 files changed, 21 insertions, 2 deletions
@@ -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 ); diff --git a/include/items.php b/include/items.php index a5d430aa2..db500fda2 100644 --- a/include/items.php +++ b/include/items.php @@ -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"); -}
\ No newline at end of file +} + diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 68edd02b9..892814804 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -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); } |