From 7e5f8d9fb323dc5e47f545984c6f9b3d320a2912 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 4 May 2017 14:38:45 +0300
Subject: move the following to Article:

+       static function format_article_enclosures($id, $always_display_enclosures,
+       static function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+       static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+       static function format_tags_string($tags) {
+       static function format_article_labels($labels) {
+       static function format_article_note($id, $note, $allow_edit = true) {
+       static function get_article_enclosures($id) {
---
 classes/feeds.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index 4d4707a94..d0ab09731 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -361,7 +361,7 @@ class Feeds extends Handler_Protected {
 				if (!is_array($labels)) $labels = get_article_labels($id);
 
 				$labels_str = "<span class=\"HLLCTR-$id\">";
-				$labels_str .= format_article_labels($labels);
+				$labels_str .= Article::format_article_labels($labels);
 				$labels_str .= "</span>";
 
 				if (count($topmost_article_ids) < 3) {
@@ -672,7 +672,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<div id=\"POSTNOTE-$id\">";
 					if ($line['note']) {
-						$reply['content'] .= format_article_note($id, $line['note']);
+						$reply['content'] .= Article::format_article_note($id, $line['note']);
 					}
 					$reply['content'] .= "</div>";
 
@@ -720,7 +720,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div class=\"cdmIntermediate\">";
 
 					$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
-					$reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
+					$reply['content'] .= Article::format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
 
 					$reply['content'] .= "</div>";
 
@@ -730,7 +730,7 @@ class Feeds extends Handler_Protected {
 						$reply['content'] .= $p->hook_article_left_button($line);
 					}
 
-					$tags_str = format_tags_string($tags, $id);
+					$tags_str = Article::format_tags_string($tags, $id);
 
 					$reply['content'] .= "<span class='left'>";
 
-- 
cgit v1.2.3-54-g00ecf