Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 21:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for some E_NOTICE and type-hints added (#5358)

Browse source 
* Fixed http://github to https://github

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes for #4965:
- updated messages.po file

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixed E_NOTICE where isset()/empty() was absent.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixed missing variable $sql_order causing E_NOTICE.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Continued:
- added array type-hint where known (some)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes:
- in Profile::load() $user is now only one-dimensional
- $a->get_hostname is no property, it is a method

Signed-off-by: Roland Häder <roland@mxchange.org>

* reverted changes that are unintended

Signed-off-by: Roland Häder <roland@mxchange.org>

* Continued:
- removed leading \ (uncommon, okay)
- removed entire if() block (CR by Hypolite)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Removed if() block

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-07-13 21:47:14 +02:00 • committed by Hypolite Petovan
parent 30cef1a739
commit 6b5d90333f
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Profile.php
View file

@ -24,6 +24,8 @@ use Friendica\Util\Network;
use Friendica\Util\Temporal;
use dba;
use InvalidArgumentException;
require_once 'include/dba.php';
require_once 'mod/proxy.php';
@ -89,7 +91,7 @@ class Profile
* @param array $profiledata array
* @param boolean $show_connect Show connect link
*/
public static function load(App $a, $nickname, $profile = 0, $profiledata = [], $show_connect = true)
public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true)
{
$user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
@ -100,11 +102,8 @@ class Profile
return;
}
if (empty($a->page['aside'])) {
$a->page['aside'] = '';
}
if ($profiledata) {
if (count($profiledata) > 0) {
// Add profile data to sidebar
$a->page['aside'] .= self::sidebar($profiledata, true, $show_connect);
if (!DBM::is_result($user)) {