]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d50a1ed)
Function calls
authorAdam Magness <adam.magness@gmail.com>
Wed, 7 Nov 2018 02:16:27 +0000 (21:16 -0500)
committerAdam Magness <adam.magness@gmail.com>
Wed, 7 Nov 2018 02:16:27 +0000 (21:16 -0500)
update function calls to new class

include/conversation.php patch | blob | history
include/enotify.php patch | blob | history
mod/item.php patch | blob | history
src/Content/Text/BBCode.php patch | blob | history
src/Object/Post.php patch | blob | history
src/Protocol/Email.php patch | blob | history

diff --git a/include/conversation.php b/include/conversation.php
index cd635521e51516545e43e937c4e294a252a4b3e6..3e953db7da6db106d1b6ffd6b5ae65de7eb41e0e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -638,7 +638,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                                $lock = false;
                                $likebuttons = false;
 
-                               $body = prepare_body($item, true, $preview);
+                               $body = Item::prepareBody($item, true, $preview);
 
                                list($categories, $folders) = get_cats_and_terms($item);
 
diff --git a/include/enotify.php b/include/enotify.php
index 339e31a3c810e01c14d3fc681e2462e687e42086..d6ca12327179404e772c743089012adbf5c54cdf 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -157,7 +157,7 @@ function notification($params)
                        $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id]);
                }
 
-               $item_post_type = item_post_type($item);
+               $item_post_type = Item::postType($item);
                $itemlink = $item['plink'];
 
                // "a post"
diff --git a/mod/item.php b/mod/item.php
index 739e09ab0fecc03c39c74c0a3d1cee9c250f4e7b..c86ed5e2787678509e366a0b729e7dd022e45b17 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -697,11 +697,10 @@ function item_post(App $a) {
                killme();
        }
 
-       if ($orig_post) {
-
+       if ($orig_post) {
                // Fill the cache field
                // This could be done in Item::update as well - but we have to check for the existance of some fields.
-               put_item_in_cache($datarray);
+               Item::putInCache($datarray);
 
                $fields = [
                        'title' => $datarray['title'],
@@ -817,7 +816,7 @@ function item_post(App $a) {
                                        $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8');
                                }
                                $link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
-                               $html    = prepare_body($datarray);
+                               $html    = Item::prepareBody($datarray);
                                $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
                                $params =  [
                                        'fromName' => $a->user['username'],
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 3592059d0ca76770ac7698fb7ac9bc449559b30e..f37400f836ac8e9c46fd817c21312dce432dee3e 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1363,7 +1363,7 @@ class BBCode extends BaseObject
                $text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $text);
 
                // leave open the posibility of [map=something]
-               // this is replaced in prepare_body() which has knowledge of the item location
+               // this is replaced in Item::prepareBody() which has knowledge of the item location
 
                if (strpos($text, '[/map]') !== false) {
                        $text = preg_replace_callback(
@@ -1474,7 +1474,7 @@ class BBCode extends BaseObject
 
                $text = str_replace('[hr]', '<hr />', $text);
 
-               // This is actually executed in prepare_body()
+               // This is actually executed in Item::prepareBody()
 
                $text = str_replace('[nosmile]', '', $text);
 
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 644d53e25d8207f8f9d2d16180ba5ec9903ac98e..e5a18e691dbe1fc2b0aa6932d624b6cb50721b0e 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -315,7 +315,7 @@ class Post extends BaseObject
 
                localize_item($item);
 
-               $body = prepare_body($item, true);
+               $body = Item::prepareBody($item, true);
 
                list($categories, $folders) = get_cats_and_terms($item);
 
diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index bb70972b03ced7d9f11fdbe1d66131ab94b08b95..ba8c311901a9bc241db400ee96f45dd0253469ba 100644 (file)
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -7,6 +7,7 @@ namespace Friendica\Protocol;
 use Friendica\Core\Logger;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Protocol;
+use Friendica\Model\Item;
 
 /**
  * @brief Email class
@@ -331,7 +332,7 @@ class Email
 
                $part = uniqid("", true);
 
-               $html    = prepare_body($item);
+               $html    = Item::prepareBody($item);
 
                $headers .= "Mime-Version: 1.0\n";
                $headers .= 'Content-Type: multipart/alternative; boundary="=_'.$part.'"'."\n\n";
Unnamed repository; edit this file 'description' to name the repository.