Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-09 16:22:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc cleanups (#5417)

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

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

* reverted back

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

* Added type-hint 'array' as the method uses foreach() on it.

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

* Tpzo fixed ...

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

* Added missing new-line at end of file, will make some POSIX parsers being lesser
confused ...

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-07-20 02:52:18 +02:00 committed by Hypolite Petovan
parent 01b67c4eb3
commit 36c6e35c7e
7 changed files with 61 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
composer.lock generated
View file

@ -2297,6 +2297,53 @@
],
"time": "2017-10-19T19:58:43+00:00"
},
{
"name": "phar-io/version",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
"reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
"reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Arne Blankerts",
"email": "arne@blankerts.de",
"role": "Developer"
},
{
"name": "Sebastian Heuer",
"email": "sebastian@phpeople.de",
"role": "Developer"
},
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de",
"role": "Developer"
}
],
"description": "Library for handling version information and constraints",
"time": "2017-03-05T17:38:23+00:00"
},
{
"name": "phpdocumentor/reflection-common",
"version": "1.0.1",
@ -3052,7 +3099,7 @@
}
],
"description": "Provides the functionality to compare PHP values for equality",
"homepage": "http://www.github.com/sebastianbergmann/comparator",
"homepage": "https://github.com/sebastianbergmann/comparator",
"keywords": [
"comparator",
"compare",
@ -3154,7 +3201,7 @@
}
],
"description": "Provides functionality to handle HHVM/PHP environments",
"homepage": "http://www.github.com/sebastianbergmann/environment",
"homepage": "https://github.com/sebastianbergmann/environment",
"keywords": [
"Xdebug",
"environment",
@ -3222,7 +3269,7 @@
}
],
"description": "Provides the functionality to export PHP variables for visualization",
"homepage": "http://www.github.com/sebastianbergmann/exporter",
"homepage": "https://github.com/sebastianbergmann/exporter",
"keywords": [
"export",
"exporter"
@ -3274,7 +3321,7 @@
}
],
"description": "Snapshotting of global state",
"homepage": "http://www.github.com/sebastianbergmann/global-state",
"homepage": "https://github.com/sebastianbergmann/global-state",
"keywords": [
"global state"
],
@ -3376,7 +3423,7 @@
}
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"homepage": "https://github.com/sebastianbergmann/recursion-context",
"time": "2016-11-19T07:33:16+00:00"
},
{

2
config/addon-sample.ini.php
View file

@ -7,4 +7,4 @@
;consumersecret = mysqlusername
INI;
// Keep this line
// Keep this line

4
config/config.ini.php
View file

@ -3,7 +3,7 @@
; CONFIG.INI.PHP
; This file declares the default values for the base config of Friendica.
; These configuration values aren't accessible from the admin settings page and custom values must be set in config/loca.ini.php
; These configuration values aren't accessible from the admin settings page and custom values must be set in config/local.ini.php
; Please don't edit this file directly as its content may change in the upcoming versions.
@ -405,4 +405,4 @@ debug = false
lockpath =
INI;
// Keep this line
// Keep this line

2
config/local-sample.ini.php
View file

@ -38,4 +38,4 @@ default_timezone = UTC
language = en
INI;
// Keep this line
// Keep this line

2
config/settings.ini.php
View file

@ -105,4 +105,4 @@ url =
[featurelock]
INI;
// Keep this line
// Keep this line

2
src/Core/NotificationsManager.php
View file

@ -224,7 +224,7 @@ class NotificationsManager extends BaseObject
* string 'ago' => T relative date of the notification
* bool 'seen' => Is the notification marked as "seen"
*/
private function formatNotifs($notifs, $ident = "")
private function formatNotifs(array $notifs, $ident = "")
{
$notif = [];
$arr = [];

8
view/theme/vier/theme.php
View file

@ -29,12 +29,10 @@ function vier_init(App $a)
$a->set_template_engine('smarty3');
if (!empty($a->argv[0])) {
if ($a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
vier_community_info();
if (!empty($a->argv[0]) && $a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
vier_community_info();
$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
}
$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
}
if ($a->is_mobile || $a->is_tablet) {