diff options
| author | Christian Fowler <spider@viovio.com> | 2012-04-18 19:55:40 -0400 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2012-04-18 19:55:40 -0400 |
| commit | 6635ab5387d083ae2939568dd5dfa4ed13b23d1f (patch) | |
| tree | 6d93a70f96930c046da5febed49020072ca31724 /articles_rss.php | |
| parent | f792d72dc5a1788d0b5f6f0c59b4c39b468c949d (diff) | |
| parent | 473cf1660c3c0815329713c2ee62747b48d76669 (diff) | |
| download | articles-6635ab5387d083ae2939568dd5dfa4ed13b23d1f.tar.gz articles-6635ab5387d083ae2939568dd5dfa4ed13b23d1f.tar.bz2 articles-6635ab5387d083ae2939568dd5dfa4ed13b23d1f.zip | |
resolve conflict
Diffstat (limited to 'articles_rss.php')
| -rw-r--r-- | articles_rss.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/articles_rss.php b/articles_rss.php index a2738a0..c1acbf9 100644 --- a/articles_rss.php +++ b/articles_rss.php @@ -45,7 +45,7 @@ if( !$gBitUser->hasPermission( 'p_articles_read' ) ) { foreach( $feeds as $feed ) { $item = new FeedItem(); $item->title = $feed['title']; - $item->link = $articles->getDisplayUrl( $feed ); + $item->link = $articles->getDisplayUrlFromHash( $feed ); // show the full article in the feed $parseHash['content_id'] = $feed['content_id']; |