Corrected bug with the default "No Category"

The SQL optimisation patch had introduced a bug with "No Category", now
solved
pull/155/head
Alexandre Alapetite 11 years ago
parent e15b7fd6ec
commit 7627970862
  1. 1
      app/controllers/feedController.php
  2. 2
      app/models/Category.php
  3. 3
      app/models/Feed.php

@ -17,6 +17,7 @@ class feedController extends ActionController {
if (Request::isPost ()) { if (Request::isPost ()) {
$url = Request::param ('url_rss'); $url = Request::param ('url_rss');
$cat = Request::param ('category'); $cat = Request::param ('category');
if (empty($cat)) $cat = '000000';
$user = Request::param ('username'); $user = Request::param ('username');
$pass = Request::param ('password'); $pass = Request::param ('password');
$params = array (); $params = array ();

@ -179,7 +179,7 @@ class CategoryDAO extends Model_pdo {
if ($prePopulateFeeds) { if ($prePopulateFeeds) {
$sql = 'SELECT c.id as c_id, c.name as c_name, c.color as c_color, count(e.id) as nbNotRead, f.* ' $sql = 'SELECT c.id as c_id, c.name as c_name, c.color as c_color, count(e.id) as nbNotRead, f.* '
. 'FROM ' . $this->prefix . 'category c ' . 'FROM ' . $this->prefix . 'category c '
. 'INNER JOIN ' . $this->prefix . 'feed f ON f.category = c.id ' . 'LEFT OUTER JOIN ' . $this->prefix . 'feed f ON f.category = c.id '
. 'LEFT OUTER JOIN ' . $this->prefix . 'entry e ON e.id_feed = f.id AND e.is_read = 0 ' . 'LEFT OUTER JOIN ' . $this->prefix . 'entry e ON e.id_feed = f.id AND e.is_read = 0 '
. 'GROUP BY f.id ' . 'GROUP BY f.id '
. 'ORDER BY c.name, f.name'; . 'ORDER BY c.name, f.name';

@ -502,6 +502,9 @@ class HelperFeed {
} }
foreach ($listDAO as $key => $dao) { foreach ($listDAO as $key => $dao) {
if (empty ($dao['url'])) {
continue;
}
if (isset ($dao['id'])) { if (isset ($dao['id'])) {
$key = $dao['id']; $key = $dao['id'];
} }

Loading…
Cancel
Save