From ceb30ba49d300d53a0693aba7e1f0e4c523aeedc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 18 Jan 2009 09:28:42 +0100
Subject: new style labels (bump schema)

---
 mobile/functions.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'mobile/functions.php')

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";
-- 
cgit v1.2.3