diff options
| author | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
|---|---|---|
| committer | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
| commit | a5bbb2bec133bdee08b361628f32430ae3884107 (patch) | |
| tree | b203105149ec234ebe155d5718d2cbb6390b4a45 /include/labels.php | |
| parent | 12727ad17d125eb2f3f243231ccca1cb0a5a7b4b (diff) | |
| parent | 2f43089de1ead3f164b8b31967d1abbb784319fa (diff) | |
Merge pull request #1 from gothfox/master
Update from original
Diffstat (limited to 'include/labels.php')
| -rw-r--r-- | include/labels.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/labels.php b/include/labels.php index c2a48a338..4149864b3 100644 --- a/include/labels.php +++ b/include/labels.php @@ -42,7 +42,8 @@ ORDER BY caption"); while ($line = db_fetch_assoc($result)) { - $rk = array($line["label_id"], $line["caption"], $line["fg_color"], + $rk = array(label_to_feed_id($line["label_id"]), + $line["caption"], $line["fg_color"], $line["bg_color"]); array_push($rv, $rk); } @@ -108,7 +109,7 @@ if (!$label_id) return; - $result = db_query( + db_query( "DELETE FROM ttrss_user_labels2 WHERE label_id = '$label_id' AND |