From dcda19480954db7f4166acf4760037f1c619745c Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Sep 2014 11:08:56 +0200 Subject: [PATCH] Broken rss feed fixes #196 --- htdocs/application/controllers/main.php | 3 ++- htdocs/application/models/pastes.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php index 2e49713..cd92a6e 100644 --- a/htdocs/application/controllers/main.php +++ b/htdocs/application/controllers/main.php @@ -543,11 +543,11 @@ class Main extends CI_Controller else { $this->load->model('pastes'); - $data = $this->pastes->getLists(); if ($this->uri->segment(2) == 'rss') { $this->load->helper('text'); + $data = $this->pastes->getLists('lists/', 3); $data['page_title'] = config_item('site_name'); $data['feed_url'] = site_url('lists/rss'); $data['replies'] = $data['pastes']; @@ -556,6 +556,7 @@ class Main extends CI_Controller } else { + $data = $this->pastes->getLists('lists/', 2); $this->load->view('list', $data); } } diff --git a/htdocs/application/models/pastes.php b/htdocs/application/models/pastes.php index bdfd6d3..845145a 100644 --- a/htdocs/application/models/pastes.php +++ b/htdocs/application/models/pastes.php @@ -426,7 +426,7 @@ class Pastes extends CI_Model $this->load->library('pagination'); $this->load->library('process'); $amount = $this->config->item('per_page'); - $page = ($this->uri->segment(2) ? $this->uri->segment(2) : 0); + $page = ($this->uri->segment($seg) ? $this->uri->segment($seg) : 0); $search = '%' . $this->input->get('search') . '%'; if ($search)