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

move get_article_labels to Article

Browse Source
This commit is contained in:
Andrew Dolgov
2017-05-04 15:26:21 +03:00
parent 2ed0d6c433
commit 4a0da0e5bf
5 changed files with 51 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
classes/api.php
View File

@@ -354,7 +354,7 @@ class API extends Handler {
"guid" => $line["guid"],
"title" => $line["title"],
"link" => $line["link"],
"labels" => get_article_labels($line['id']),
"labels" => Article::get_article_labels($line['id']),
"unread" => sql_bool_to_bool($line["unread"]),
"marked" => sql_bool_to_bool($line["marked"]),
"published" => sql_bool_to_bool($line["published"]),
@@ -450,7 +450,7 @@ class API extends Handler {
WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
if ($article_id)
$article_labels = get_article_labels($article_id);
$article_labels = Article::get_article_labels($article_id);
else
$article_labels = array();
@@ -740,10 +740,7 @@ class API extends Handler {
}
}
if (!is_array($labels)) $labels = get_article_labels($line["id"]);
//if (!$tags) $tags = get_article_tags($line["id"]);
//if (!$labels) $labels = get_article_labels($line["id"]);
if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
$headline_row = array(
"id" => (int)$line["id"],