Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 00:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2023.03-rc' into npf2

Browse source
This commit is contained in:
Michael 2023-03-27 06:42:24 +00:00
commit c4c80ed3cc
266 changed files with 691 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Content/BoundariesPager.php
View file

@ -94,7 +94,7 @@ class BoundariesPager extends Pager
* $params = ['order' => ['sort_field' => true], 'limit' => $itemsPerPage];
* $items = DBA::toArray(DBA::select($table, $fields, $condition, $params));
*
* $pager = new BoundariesPager($a->query_string, $items[0]['sort_field'], $items[coutn($items) - 1]['sort_field'], $itemsPerPage);
* $pager = new BoundariesPager($a->query_string, $items[0]['sort_field'], $items[count($items) - 1]['sort_field'], $itemsPerPage);
*
* $html = $pager->renderMinimal(count($items));
*

2
src/Content/Conversation.php
View file

@ -1362,7 +1362,7 @@ class Conversation
}
}
/// @TODO: Stop recusrsively adding all children back to the top level (!!!)
/// @TODO: Stop recursively adding all children back to the top level (!!!)
/// However, this apparently ensures responses (likes, attendance) display (?!)
foreach ($parents as $parent) {
if (count($parent['children'])) {

2
src/Content/Feature.php
View file

@ -79,7 +79,7 @@ class Feature
* Get a list of all available features
*
* The array includes the setting group, the setting name,
* explainations for the setting and if it's enabled or disabled
* explanations for the setting and if it's enabled or disabled
* by default
*
* @param bool $filtered True removes any locked features

4
src/Content/ForumManager.php
View file

@ -38,7 +38,7 @@ class ForumManager
*
* @param int $uid of the profile owner
* @param boolean $lastitem Sort by lastitem
* @param boolean $showhidden Show frorums which are not hidden
* @param boolean $showhidden Show forums which are not hidden
* @param boolean $showprivate Show private groups
*
* @return array
@ -102,7 +102,7 @@ class ForumManager
/**
* Forumlist widget
*
* Sidebar widget to show subcribed friendica forums. If activated
* Sidebar widget to show subscribed friendica forums. If activated
* in the settings, it appears at the notwork page sidebar
*
* @param string $baseurl Base module path

10
src/Content/Item.php
View file

@ -338,7 +338,7 @@ class Item
} else {
$post_type = $this->l10n->t('status');
}
// Let's break everthing ... ;-)
// Let's break everything ... ;-)
break;
}
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
@ -548,7 +548,7 @@ class Item
$item['allow_cid'] = '';
$item['allow_gid'] = '';
}
} elseif ($setPermissions && ($item['gravity'] == ItemModel::GRAVITY_PARENT)) {
} elseif ($setPermissions) {
if (empty($receivers)) {
// For security reasons direct posts without any receiver will be posts to yourself
$self = Contact::selectFirst(['id'], ['uid' => $item['uid'], 'self' => true]);
@ -685,11 +685,11 @@ class Item
// If it is a reshared post then reformat it to avoid display problems with two share elements
if (!empty($shared)) {
if (!empty($shared['guid']) && ($encaspulated_share = $this->createSharedPostByGuid($shared['guid'], true))) {
if (!empty($shared['guid']) && ($encapsulated_share = $this->createSharedPostByGuid($shared['guid'], true))) {
if (!empty(BBCode::fetchShareAttributes($item['body']))) {
$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encapsulated_share, $item['body']);
} else {
$item['body'] .= $encaspulated_share;
$item['body'] .= $encapsulated_share;
}
}
$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));

4
src/Content/OEmbed.php
View file

@ -385,7 +385,7 @@ class OEmbed
}
/**
* Returns a formmated HTML code from given URL and sets optional title
* Returns a formatted HTML code from given URL and sets optional title
*
* @param string $url URL to fetch
* @param string $title Optional title (default: what comes from OEmbed object)
@ -447,7 +447,7 @@ class OEmbed
* Generates an XPath query to select elements whose provided attribute contains
* the provided value in a space-separated list.
*
* @param string $attr Name of the attribute to seach
* @param string $attr Name of the attribute to search
* @param string $value Value to search in a space-separated list
* @return string
*/

2
src/Content/PageInfo.php
View file

@ -141,7 +141,7 @@ class PageInfo
$data['text'] = '';
}
// Only embedd a picture link when it seems to be a valid picture ("width" is set)
// Only embed a picture link when it seems to be a valid picture ("width" is set)
if (!empty($data['images']) && !empty($data['images'][0]['width'])) {
$preview = str_replace(['[', ']'], ['[', ']'], htmlentities($data['images'][0]['src'], ENT_QUOTES, 'UTF-8', false));
// if the preview picture is larger than 500 pixels then show it in a larger mode

2
src/Content/Smilies.php
View file

@ -133,7 +133,7 @@ class Smilies
'<img class="smiley" src="' . $baseUrl . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
'<img class="smiley" src="' . $baseUrl . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
'<img class="smiley" src="' . $baseUrl . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
'<img class="smiley" src="' . $baseUrl . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
'<img class="smiley" src="' . $baseUrl . '/images/smiley-embarrassed.gif" alt=":-[" title=":-[" />',
'<img class="smiley" src="' . $baseUrl . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
'<img class="smiley" src="' . $baseUrl . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
'<img class="smiley" src="' . $baseUrl . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',

4
src/Content/Text/BBCode.php
View file

@ -548,7 +548,7 @@ class BBCode
/*
* The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
* now turns back and the [noparse] tags are trimed
* now turns back and the [noparse] tags are trimmed
* returning [i]italic[/i]
*
* @param array $match
@ -1373,7 +1373,7 @@ class BBCode
});
}
// leave open the posibility of [map=something]
// leave open the possibility of [map=something]
// this is replaced in Item::prepareBody() which has knowledge of the item location
if (strpos($text, '[/map]') !== false) {
$text = preg_replace_callback(

2
src/Content/Text/HTML.php
View file

@ -842,7 +842,7 @@ class HTML
*
* @param string $s Search query.
* @param string $id HTML id
* @param bool $aside Display the search widgit aside.
* @param bool $aside Display the search widget aside.
*
* @return string Formatted HTML.
* @throws \Exception

2
src/Content/Text/Plaintext.php
View file

@ -180,7 +180,7 @@ class Plaintext
$msg = trim($post['description']);
}
// If the link is already contained in the post, then it neeedn't to be added again
// If the link is already contained in the post, then it needn't to be added again
// But: if the link is beyond the limit, then it has to be added.
if (($link != '') && strstr($msg, $link)) {
$pos = strpos($msg, $link);

2
src/Content/Widget.php
View file

@ -59,7 +59,7 @@ class Widget
/**
* Return Find People widget
*
* @return string HTML code respresenting "People Widget"
* @return string HTML code representing "People Widget"
*/
public static function findPeople(): string
{