public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 08:15:55 +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

2
plugins/auto_assign_labels/init.php
View File

@@ -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"]));
}

4
plugins/import_export/init.php
View File

@@ -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);
}
}

2
plugins/note/init.php
View File

@@ -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)));