diff options
| author | Andrew Dolgov <[email protected]> | 2017-05-04 15:57:40 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-05-04 15:57:40 +0300 |
| commit | 7c9b5a3fe40a641af1cb6003b03b2352576a0c4b (patch) | |
| tree | aee154f7437c945c18074a2a158a65845ef115f2 /plugins | |
| parent | c2f0f24e4c4577944b563f3c0af92a8ed89b8e61 (diff) | |
move label stuff to Labels class
fix some unresolved functions
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/auto_assign_labels/init.php | 2 | ||||
| -rw-r--r-- | plugins/import_export/init.php | 4 | ||||
| -rw-r--r-- | plugins/note/init.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/auto_assign_labels/init.php b/plugins/auto_assign_labels/init.php index 4592175e3..1209a02ab 100644 --- a/plugins/auto_assign_labels/init.php +++ b/plugins/auto_assign_labels/init.php @@ -21,7 +21,7 @@ class Auto_Assign_Labels extends Plugin { $result = db_query("SELECT id, fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid); while ($line = db_fetch_assoc($result)) { - array_push($rv, array(label_to_feed_id($line["id"]), + array_push($rv, array(Labels::label_to_feed_id($line["id"]), $line["caption"], $line["fg_color"], $line["bg_color"])); } diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php index ec618b723..27cb73698 100644 --- a/plugins/import_export/init.php +++ b/plugins/import_export/init.php @@ -378,10 +378,10 @@ class Import_Export extends Plugin implements IHandler { if (is_array($label_cache) && $label_cache["no-labels"] != 1) { foreach ($label_cache as $label) { - label_create($label[1], + Labels::create($label[1], $label[2], $label[3], $owner_uid); - label_add_article($ref_id, $label[1], $owner_uid); + Labels::add_article($ref_id, $label[1], $owner_uid); } } diff --git a/plugins/note/init.php b/plugins/note/init.php index dd372ce5e..65cdf30e4 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -62,7 +62,7 @@ class Note extends Plugin { db_query("UPDATE ttrss_user_entries SET note = '$note' WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - $formatted_note = format_article_note($id, $note); + $formatted_note = Article::format_article_note($id, $note); print json_encode(array("note" => $formatted_note, "raw_length" => mb_strlen($note))); |