diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-27 09:40:07 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-27 09:40:07 +0400 |
| commit | f822a8e56c747a168e69c73d8519d8b08b3ae809 (patch) | |
| tree | b9ed1f6ac1fe54bde7562ccc74abdfbaba3b0864 /classes | |
| parent | 260501fddde2998647fbca0b80d0d9903b0578b3 (diff) | |
experimentally rebase labels; make base index configurable
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 6 | ||||
| -rw-r--r-- | classes/pref/feeds.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 89ebd4a0a..2c45da2dd 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -700,7 +700,7 @@ class Feeds extends Handler_Protected { $message = __("No starred articles found to display."); break; default: - if ($feed < -10) { + if ($feed < LABEL_BASE_INDEX) { $message = __("No articles found to display. You can assign articles to labels manually (see the Actions menu above) or use a filter."); } else { $message = __("No articles found to display."); @@ -777,8 +777,8 @@ class Feeds extends Handler_Protected { $result = false; - if ($feed < -10) { - $label_feed = -11-$feed; + if ($feed < LABEL_BASE_INDEX) { + $label_feed = feed_to_label_id($feed); $result = db_query($this->link, "SELECT id FROM ttrss_labels2 WHERE id = '$label_feed' AND owner_uid = " . $_SESSION['uid']); } else if (!$cat_view && is_numeric($feed) && $feed > 0) { diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index ca4ae344f..a6811f3fc 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -134,7 +134,7 @@ class Pref_Feeds extends Handler_Protected { while ($line = db_fetch_assoc($result)) { - $label_id = -$line['id'] - 11; + $label_id = label_to_feed_id($line['id']); $feed = $this->feedlist_init_feed($label_id, false, 0); @@ -1700,8 +1700,8 @@ class Pref_Feeds extends Handler_Protected { ccache_remove($link, $id, $owner_uid); } else { - label_remove($link, -11-$id, $owner_uid); - ccache_remove($link, -11-$id, $owner_uid); + label_remove($link, feed_to_label_id($id), $owner_uid); + //ccache_remove($link, $id, $owner_uid); don't think labels are cached } } |