PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-25 20:41:20 -05:00
Code Issues Projects Releases Wiki Activity

Broken rss feed

Browse Source 
fixes #196
This commit is contained in:
Claude 2014-09-30 11:08:56 +02:00
parent a04b225eee
commit dcda194809
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/application/controllers/main.php
View File

@ -543,11 +543,11 @@ class Main extends CI_Controller
else else
{ {
$this->load->model('pastes'); $this->load->model('pastes');
$data = $this->pastes->getLists();
if ($this->uri->segment(2) == 'rss') if ($this->uri->segment(2) == 'rss')
{ {
$this->load->helper('text'); $this->load->helper('text');
$data = $this->pastes->getLists('lists/', 3);
$data['page_title'] = config_item('site_name'); $data['page_title'] = config_item('site_name');
$data['feed_url'] = site_url('lists/rss'); $data['feed_url'] = site_url('lists/rss');
$data['replies'] = $data['pastes']; $data['replies'] = $data['pastes'];
@ -556,6 +556,7 @@ class Main extends CI_Controller
} }
else else
{ {
$data = $this->pastes->getLists('lists/', 2);
$this->load->view('list', $data); $this->load->view('list', $data);
} }
} }

2
htdocs/application/models/pastes.php
View File

@ -426,7 +426,7 @@ class Pastes extends CI_Model
$this->load->library('pagination'); $this->load->library('pagination');
$this->load->library('process'); $this->load->library('process');
$amount = $this->config->item('per_page'); $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') . '%'; $search = '%' . $this->input->get('search') . '%';
if ($search) if ($search)