diff options
author | Christian Weiske <cweiske@cweiske.de> | 2011-03-20 22:15:34 +0100 |
---|---|---|
committer | Christian Weiske <cweiske@cweiske.de> | 2011-03-20 22:15:34 +0100 |
commit | bc178983b370ed005d569d70b4629e3181acc522 (patch) | |
tree | a7d5e99d85063641415b71f1b4160b3fb85a505a /www/rss.php | |
parent | 8146646a0e1c7535e62aeebab049f7b1740c86ae (diff) | |
parent | 975809a8347929c9eae9c6a8bf3beb8d92af63ef (diff) | |
download | semanticscuttle-bc178983b370ed005d569d70b4629e3181acc522.tar.gz semanticscuttle-bc178983b370ed005d569d70b4629e3181acc522.tar.bz2 |
Merge branch 'master' into jquery
Conflicts:
doc/ChangeLog
Diffstat (limited to 'www/rss.php')
-rw-r--r-- | www/rss.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/www/rss.php b/www/rss.php index 6dcfb4c..298d9ba 100644 --- a/www/rss.php +++ b/www/rss.php @@ -116,7 +116,7 @@ foreach ($bookmarks_tmp as $key => $row) { 'title' => $row['bTitle'], 'link' => $_link, 'description' => $row['bDescription'], - 'creator' => $row['username'], + 'creator' => SemanticScuttle_Model_UserArray::getName($row), 'pubdate' => $_pubdate, 'tags' => $row['tags'] ); |