diff options
| author | Andrew Dolgov <[email protected]> | 2009-01-18 09:28:42 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2009-01-18 09:28:42 +0100 |
| commit | ceb30ba49d300d53a0693aba7e1f0e4c523aeedc (patch) | |
| tree | f914db574e5d19af48c997eaf26dc5ff69de7a64 /mobile | |
| parent | abd9b16507fd517dc56af1be0d11d7043063ddc5 (diff) | |
new style labels (bump schema)
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/functions.php | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/mobile/functions.php b/mobile/functions.php index a37bc0207..db8e2947b 100644 --- a/mobile/functions.php +++ b/mobile/functions.php @@ -65,11 +65,10 @@ print "</ul>"; } - if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) { - $result = db_query($link, "SELECT id,description FROM - ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description"); - + $result = db_query($link, "SELECT id,caption FROM + ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption"); + if (db_num_rows($result) > 0) { if (get_pref($link, 'ENABLE_FEED_CATS')) { print "<li class=\"feedCat\">".__("Labels")."</li>"; @@ -81,8 +80,6 @@ while ($line = db_fetch_assoc($result)) { - error_reporting (0); - $count = getFeedUnread($link, -$line["id"]-11); $class = "label"; @@ -90,11 +87,9 @@ if ($count > 0) { $class .= "Unread"; } - - error_reporting (DEFAULT_ERROR_LEVEL); - + printMobileFeedEntry(-$line["id"]-11, - $class, $line["description"], $count, "../images/label.png", $link); + $class, $line["caption"], $count, "../images/label.png", $link); } @@ -104,7 +99,6 @@ } } - } if (get_pref($link, 'ENABLE_FEED_CATS')) { $order_by_qpart = "category,title"; |