harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	boot.php
	include/api.php
	include/enotify.php
This commit is contained in:
redmatrix
2015-05-13 17:07:12 -07:00
parent 4ca06ebd79 c82082d2bb
commit 475dc7b686
13 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@@ -554,7 +554,7 @@ function get_feed_for($channel, $observer_hash, $params) {
$atom .= replace_macros($feed_template, array(
'$version' => xmlify(RED_VERSION),
'$red' => xmlify(RED_PLATFORM),
'$red' => xmlify(PLATFORM_NAME),
'$feed_id' => xmlify($channel['xchan_url']),
'$feed_title' => xmlify($channel['channel_name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,