Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5258 from Quix0r/rewrites/curly-braces-is-result-usage-002-split1

Browse source 
Curly braces, whitespaces and duplicate method invocation fixed
This commit is contained in:
Hypolite Petovan 2018-06-20 16:51:22 -04:00 committed by GitHub
commit dd1e6dd4a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/text.php
View file

@ -1970,6 +1970,7 @@ function is_a_date_arg($s) {
*/ */
function deindent($text, $chr = "[\t ]", $count = NULL) { function deindent($text, $chr = "[\t ]", $count = NULL) {
$lines = explode("\n", $text); $lines = explode("\n", $text);
if (is_null($count)) { if (is_null($count)) {
$m = []; $m = [];
$k = 0; $k = 0;

2
mod/message.php
View file

@ -141,6 +141,7 @@ function message_content(App $a)
'$cancel' => L10n::t('Cancel'), '$cancel' => L10n::t('Cancel'),
]); ]);
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if ($_REQUEST['canceled']) { if ($_REQUEST['canceled']) {
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
@ -151,6 +152,7 @@ function message_content(App $a)
if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) { if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
info(L10n::t('Message deleted.') . EOL); info(L10n::t('Message deleted.') . EOL);
} }
//goaway(System::baseUrl(true) . '/message' ); //goaway(System::baseUrl(true) . '/message' );
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} else { } else {

1
mod/photos.php
View file

@ -1231,6 +1231,7 @@ function photos_content(App $a)
*/ */
if (!Config::get('system', 'no_count', false)) { if (!Config::get('system', 'no_count', false)) {
$order_field = defaults($_GET, 'order', ''); $order_field = defaults($_GET, 'order', '');
if ($order_field === 'posted') { if ($order_field === 'posted') {
$order = 'ASC'; $order = 'ASC';
} else { } else {

1
mods/sample-nginx.config
View file

@ -87,7 +87,6 @@ server {
} }
} }
# make sure webfinger and other well known services aren't blocked # make sure webfinger and other well known services aren't blocked
# by denying dot files and rewrite request to the front controller # by denying dot files and rewrite request to the front controller
location ^~ /.well-known/ { location ^~ /.well-known/ {

2
src/Protocol/DFRN.php
View file

@ -2080,9 +2080,7 @@ class DFRN
'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"], 'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]]; 'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])]; $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
dba::update('contact', $fields, $condition);
// @TODO No dba:update here?
dba::update('contact', $fields, $condition); dba::update('contact', $fields, $condition);
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);