Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 01:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more unneeded settings removed

Browse source
This commit is contained in:
Michael 2020-02-19 19:31:55 +00:00
parent 858b63656e
commit 7ee9aad6ca
6 changed files with 2 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Core/System.php
View file

@ -299,18 +299,6 @@ class System
*/
public static function htmlUpdateExit($o)
{
if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
$replace = "<br />".DI::l10n()->t("[Embedded content - reload page to view]")."<br />";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$o = preg_replace($pattern, $replace, $o);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
$o = preg_replace($pattern, $replace, $o);
$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
$o = preg_replace($pattern, $replace, $o);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$o = preg_replace($pattern, $replace, $o);
}
header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
// We can remove this hack once Internet Explorer recognises HTML5 natively

29
src/Model/Contact.php
View file

@ -640,35 +640,6 @@ class Contact
return $return;
}
/**
* Returns the count of OStatus contacts in a group
*
* @param int $gid
* @return int
* @throws \Exception
*/
public static function getOStatusCountByGroupId($gid)
{
$return = 0;
if (intval($gid)) {
$contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count`
FROM `contact`
INNER JOIN `group_member`
ON `contact`.`id` = `group_member`.`contact-id`
WHERE `gid` = ?
AND `contact`.`uid` = ?
AND `contact`.`network` = ?
AND `contact`.`notify` != ""',
$gid,
local_user(),
Protocol::OSTATUS
);
$return = $contacts['count'];
}
return $return;
}
/**
* Creates the self-contact for the provided user id
*