public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:25:59 +00:00
Code Issues Releases Wiki Activity

move label stuff to Labels class

Browse Source 
fix some unresolved functions
This commit is contained in:
Andrew Dolgov
2017-05-04 15:57:40 +03:00
parent c2f0f24e4c
commit 7c9b5a3fe4
13 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/pref/feeds.php
View File

@@ -171,7 +171,7 @@ class Pref_Feeds extends Handler_Protected {
while ($line = $this->dbh->fetch_assoc($result)) {
$label_id = label_to_feed_id($line['id']);
$label_id = Labels::label_to_feed_id($line['id']);
$feed = $this->feedlist_init_feed($label_id, false, 0);
@@ -1806,7 +1806,7 @@ class Pref_Feeds extends Handler_Protected {
CCache::remove($id, $owner_uid);
} else {
label_remove(feed_to_label_id($id), $owner_uid);
Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
//CCache::remove($id, $owner_uid); don't think labels are cached
}
}

8
classes/pref/labels.php
View File

@@ -136,7 +136,7 @@ class Pref_Labels extends Handler_Protected {
AND owner_uid = " . $_SESSION["uid"]);
}
$caption = $this->dbh->escape_string(label_find_caption($id, $_SESSION["uid"]));
$caption = $this->dbh->escape_string(Labels::find_caption($id, $_SESSION["uid"]));
/* Remove cached data */
@@ -156,7 +156,7 @@ class Pref_Labels extends Handler_Protected {
fg_color = '', bg_color = '' WHERE id = '$id'
AND owner_uid = " . $_SESSION["uid"]);
$caption = $this->dbh->escape_string(label_find_caption($id, $_SESSION["uid"]));
$caption = $this->dbh->escape_string(Labels::find_caption($id, $_SESSION["uid"]));
/* Remove cached data */
@@ -216,7 +216,7 @@ class Pref_Labels extends Handler_Protected {
$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
foreach ($ids as $id) {
label_remove($id, $_SESSION["uid"]);
Labels::remove($id, $_SESSION["uid"]);
}
}
@@ -227,7 +227,7 @@ class Pref_Labels extends Handler_Protected {
if ($caption) {
if (label_create($caption)) {
if (Labels::create($caption)) {
if (!$output) {
print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
}