summaryrefslogtreecommitdiff
path: root/classes/pref
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-05-04 15:57:40 +0300
committerAndrew Dolgov <[email protected]>2017-05-04 15:57:40 +0300
commit7c9b5a3fe40a641af1cb6003b03b2352576a0c4b (patch)
treeaee154f7437c945c18074a2a158a65845ef115f2 /classes/pref
parentc2f0f24e4c4577944b563f3c0af92a8ed89b8e61 (diff)
move label stuff to Labels class
fix some unresolved functions
Diffstat (limited to 'classes/pref')
-rwxr-xr-xclasses/pref/feeds.php4
-rw-r--r--classes/pref/labels.php8
2 files changed, 6 insertions, 6 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c12e76f6b..f1eea93f7 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -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
}
}
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 26fbb02b1..5720a1f4b 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -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));
}