try to fix updating in profile

[quix0rs-gnu-social.git] / actions / all.php

diff --git a/actions/all.php b/actions/all.php
index fa1be8c9628372c93fb7edafa4259f437d5e6c3c..7cd1f5beba9a9146c23eb62f0986c42de0e87447 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -1,4 +1,25 @@
 <?php
+/* 
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/actions/showstream.php');
 
 class AllAction extends ShowstreamAction {
 
@@ -9,24 +30,25 @@ class AllAction extends ShowstreamAction {
                $notice = DB_DataObject::factory('notice');
                
                # XXX: chokety and bad
-               
-               $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = {$profile->id})', 'OR');
-               $notice->whereAdd('profile_id = {$profile->id}', 'OR');
+
+               $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR');
+               $notice->whereAdd('profile_id = ' . $profile->id, 'OR');
                
                $notice->orderBy('created DESC');
                
                $page = $this->arg('page') || 1;
                
-               $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE);
+               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
                
                $notice->find();
                
-               common_start_element('div', 'notices');
+               common_element_start('div', 'notices');
 
                while ($notice->fetch()) {
                        $this->show_notice($notice);
                }
                
-               common_end_element('div');
+               # XXX: show a link for the next page
+               common_element_end('div');
        }
 }