From 4a0da0e5bf06e91cd3d461c98d54a0723ed0529c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 May 2017 15:26:21 +0300 Subject: move get_article_labels to Article --- classes/api.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index 31dd3c086..cb035c86b 100644 --- a/classes/api.php +++ b/classes/api.php @@ -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"], -- cgit v1.2.3-54-g00ecf