bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Some more removed notices

Browse source
This commit is contained in:
Michael 2018-08-10 19:39:43 +00:00
commit 170dd2a705
7 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@ class BBCode extends BaseObject
$post["url"] = $matches[1];
$post["title"] = $matches[2];
}
if (!empty($post["url"] == "") && (in_array($post["type"], ["link", "video"]))
if (!empty($post["url"]) && (in_array($post["type"], ["link", "video"]))
&& preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
$post["url"] = $matches[1];
}

4
src/Model/User.php
View file

@ -659,7 +659,7 @@ class User
* @param string $password
* @return NULL|boolean from notification() and email() inherited
*/
public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password)
public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password, $user)
{
$preamble = deindent(L10n::t('
Dear %1$s,
@ -697,6 +697,8 @@ class User
$body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
return notification([
'uid' => $user['uid'],
'language' => $user['language'],
'type' => SYSTEM_EMAIL,
'to_email' => $email,
'subject'=> L10n::t('Registration details for %s', $sitename),