diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-15 08:55:19 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-15 08:55:19 +0100 |
| commit | abf976bb36503268d810b7733407caaf3351dca2 (patch) | |
| tree | c43dca8a4cff4aa84f4bedde03593968292d948a /include/items.php | |
| parent | a118f83ee23d9151157500737022db018e922a9f (diff) | |
| parent | e7ae4ad3fa010e5f636738366aae81e129990fa7 (diff) | |
| download | volse-hubzilla-abf976bb36503268d810b7733407caaf3351dca2.tar.gz volse-hubzilla-abf976bb36503268d810b7733407caaf3351dca2.tar.bz2 volse-hubzilla-abf976bb36503268d810b7733407caaf3351dca2.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index 47bc9f15a..1a5ca5a1f 100644 --- a/include/items.php +++ b/include/items.php @@ -182,6 +182,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $atom .= replace_macros($feed_template, array( + '$version' => xmlify(FRIENDIKA_VERSION), '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner_nick), '$feed_title' => xmlify($owner['name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , @@ -991,7 +992,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { * */ - $bdtext = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . t('\'s birthday'); + $bdtext = t('Birthday:') . ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ; $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`desc`,`type`) |