diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-04-03 10:47:07 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-04-03 10:47:07 +0200 |
| commit | e3ebdbd79baa31b64ab724a76c2b80e907f3b367 (patch) | |
| tree | 3c0df579f7942984e80a800c144da64c6a6522cc /phpBB/feed.php | |
| parent | 3e5236dcd62f1d0b18cd3c92661a2287b5bbf2d6 (diff) | |
| parent | 43774ef423d205250181c7413585ecd4d9ad6388 (diff) | |
| download | forums-e3ebdbd79baa31b64ab724a76c2b80e907f3b367.tar forums-e3ebdbd79baa31b64ab724a76c2b80e907f3b367.tar.gz forums-e3ebdbd79baa31b64ab724a76c2b80e907f3b367.tar.bz2 forums-e3ebdbd79baa31b64ab724a76c2b80e907f3b367.tar.xz forums-e3ebdbd79baa31b64ab724a76c2b80e907f3b367.zip | |
Merge branch 'develop-olympus' into git-tools
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index a42aa42a7f..4ce983a967 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -783,8 +783,8 @@ class phpbb_feed_overall extends phpbb_feed_post_base 'p.post_id, p.topic_id, p.post_time, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . 'u.username, u.user_id', 'FROM' => array( - POSTS_TABLE => 'p', USERS_TABLE => 'u', + POSTS_TABLE => 'p', ), 'LEFT_JOIN' => array( array( |