clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapt naming convention

Browse Source
This commit is contained in:
Philipp Holzer
2019-10-23 21:38:51 +02:00
parent 3eb3e0b5ce
commit c9e1098dd2
7 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Item.php
View File

@@ -17,8 +17,8 @@ use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Protocol\Activity;
@@ -3350,7 +3350,7 @@ class Item extends BaseObject
|| $rendered_hash != hash("md5", $item["body"])
|| Config::get("system", "ignore_cache")
) {
self::addRedirLinkToImageLinks($item);
self::addRedirToImageTags($item);
$item["rendered-html"] = BBCode::convert($item["body"]);
$item["rendered-hash"] = hash("md5", $item["body"]);
@@ -3390,7 +3390,7 @@ class Item extends BaseObject
*
* @param array &$item The field array of an item row
*/
private static function addRedirLinkToImageLinks(array &$item)
private static function addRedirToImageTags(array &$item)
{
$app = self::getApp();

6
src/Util/ACLFormatter.php
View File

@@ -30,7 +30,7 @@ final class ACLFormatter
*
* @param string $item The item to sanitise
*/
private function sanitiseAcl(string &$item) {
private function sanitize(string &$item) {
if (intval($item)) {
$item = '<' . intval(Strings::escapeTags(trim($item))) . '>';
} elseif (in_array($item, [Group::FOLLOWERS, Group::MUTUALS])) {
@@ -50,7 +50,7 @@ final class ACLFormatter
*
* @return string
*/
function aclToString($permissions) {
function toString($permissions) {
$return = '';
if (is_array($permissions)) {
$item = $permissions;
@@ -59,7 +59,7 @@ final class ACLFormatter
}
if (is_array($item)) {
array_walk($item, [$this, 'sanitiseAcl']);
array_walk($item, [$this, 'sanitize']);
$return = implode('', $item);
}
return $return;