friendica
/
friendica
mirror of https://github.com/friendica/friendica.git
1
2
Fork 1
Code Issues Releases 48 Wiki Activity
Browse Source

Function calls 

update function calls to new class
tags/2019.01
Adam Magness 2 years ago
parent
d50a1edef4
commit
e537f7d017
6 changed files with 10 additions and 10 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      include/conversation.php
  2. +1
    -1
      include/enotify.php
  3. +3
    -4
      mod/item.php
  4. +2
    -2
      src/Content/Text/BBCode.php
  5. +1
    -1
      src/Object/Post.php
  6. +2
    -1
      src/Protocol/Email.php

+ 1
- 1
include/conversation.php View File

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



+ 1
- 1
include/enotify.php View File

@@ -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"


+ 3
- 4
mod/item.php View File

@@ -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'],


+ 2
- 2
src/Content/Text/BBCode.php View File

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



+ 1
- 1
src/Object/Post.php View File

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



+ 2
- 1
src/Protocol/Email.php View File

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


Write Preview
Loading…
Cancel
Save