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

rss fix

Browse Source
This commit is contained in:
Claude 2012-05-13 23:11:50 +02:00
parent 1edd39a209
commit 7a434a58bb
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ class Pastes extends CI_Model
{ {
$pid = $this->uri->segment($seg); $pid = $this->uri->segment($seg);
} }
$this->db->select('title, name, created, pid, paste, raw'); $this->db->select('title, name, created, pid, raw, lang');
$this->db->where('replyto', $pid); $this->db->where('replyto', $pid);
$this->db->order_by('id', 'desc'); $this->db->order_by('id', 'desc');
$this->db->limit($amount); $this->db->limit($amount);
@ -324,7 +324,7 @@ class Pastes extends CI_Model
$data['replies'][$n]['name'] = $row['name']; $data['replies'][$n]['name'] = $row['name'];
$data['replies'][$n]['created'] = $row['created']; $data['replies'][$n]['created'] = $row['created'];
$data['replies'][$n]['pid'] = $row['pid']; $data['replies'][$n]['pid'] = $row['pid'];
$data['replies'][$n]['paste'] = $row['paste']; $data['replies'][$n]['paste'] = $this->process->syntax(htmlspecialchars_decode($row['raw']) , $row['lang']);
$data['replies'][$n]['raw'] = $row['raw']; $data['replies'][$n]['raw'] = $row['raw'];
$n++; $n++;
} }
@ -335,6 +335,7 @@ class Pastes extends CI_Model
function getLists($root = 'lists/', $seg = 2) function getLists($root = 'lists/', $seg = 2)
{ {
$this->load->library('pagination'); $this->load->library('pagination');
$this->load->library('process');
$amount = $this->config->item('per_page'); $amount = $this->config->item('per_page');
if (!$this->uri->segment(2)) if (!$this->uri->segment(2))
@ -348,7 +349,21 @@ class Pastes extends CI_Model
$this->db->where('private', 0); $this->db->where('private', 0);
$this->db->order_by('created', 'desc'); $this->db->order_by('created', 'desc');
$query = $this->db->get('pastes', $amount, $page); $query = $this->db->get('pastes', $amount, $page);
$data['pastes'] = $query->result_array();
if ($query->num_rows() > 0)
{
$n = 0;
foreach ($query->result_array() as $row)
{
$data['pastes'][$n]['title'] = $row['title'];
$data['pastes'][$n]['name'] = $row['name'];
$data['pastes'][$n]['created'] = $row['created'];
$data['pastes'][$n]['pid'] = $row['pid'];
$data['pastes'][$n]['paste'] = $this->process->syntax(htmlspecialchars_decode($row['raw']) , $row['lang']);
$data['pastes'][$n]['raw'] = $row['raw'];
$n++;
}
}
$config['base_url'] = site_url($root); $config['base_url'] = site_url($root);
$config['total_rows'] = $this->countPastes(); $config['total_rows'] = $this->countPastes();
$config['per_page'] = $amount; $config['per_page'] = $amount;