keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6833 from MrPetovan/bug/notices

Browse source 
Fix various notices
This commit is contained in:
Tobias Diekershoff 2019-03-09 09:12:09 +01:00 committed by GitHub
commit af77af0446
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/filerm.php
View file

@ -12,7 +12,7 @@ function filerm_content(App $a)
exit(); exit();
} }
$term = XML::unescape(trim($_GET['term'])); $term = XML::unescape(trim(defaults($_GET, 'term', '')));
$cat = XML::unescape(trim(defaults($_GET, 'cat', ''))); $cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
$category = (($cat) ? true : false); $category = (($cat) ? true : false);

6
mod/follow.php
View file

@ -60,7 +60,11 @@ function follow_content(App $a)
} }
$uid = local_user(); $uid = local_user();
$url = Strings::escapeTags(trim($_REQUEST['url'])); $url = Strings::escapeTags(trim(defaults($_REQUEST, 'url', '')));
if (!$url) {
$a->internalRedirect($return_path);
}
$submit = L10n::t('Submit Request'); $submit = L10n::t('Submit Request');

2
src/Model/Register.php
View file

@ -25,7 +25,7 @@ class Register
public static function getPending() public static function getPending()
{ {
$stmt = DBA::p( $stmt = DBA::p(
"SELECT `register`.*, `contact`.`name`, `user`.`email` "SELECT `register`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`email`
FROM `register` FROM `register`
INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid` INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
INNER JOIN `user` ON `register`.`uid` = `user`.`uid`" INNER JOIN `user` ON `register`.`uid` = `user`.`uid`"

2
src/Object/Image.php
View file

@ -447,7 +447,7 @@ class Image
return; return;
} }
$ort = $exif['IFD0']['Orientation']; $ort = isset($exif['IFD0']['Orientation']) ? $exif['IFD0']['Orientation'] : 1;
switch ($ort) { switch ($ort) {
case 1: // nothing case 1: // nothing

2
view/theme/frio/php/default.php
View file

@ -44,7 +44,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
// It makes mobile Chrome UI match Frio's top bar color. // It makes mobile Chrome UI match Frio's top bar color.
$uid = Profile::getThemeUid($a); $uid = Profile::getThemeUid($a);
$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema')); $scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
if ($scheme && ($scheme != '---')) { if ($scheme && is_string($scheme) && $scheme != '---') {
if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) { if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php'; $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
require_once $schemefile; require_once $schemefile;

2
view/theme/frio/php/scheme.php
View file

@ -25,7 +25,7 @@ function get_scheme_info($scheme)
$theme = \get_app()->getCurrentTheme(); $theme = \get_app()->getCurrentTheme();
$themepath = 'view/theme/' . $theme . '/'; $themepath = 'view/theme/' . $theme . '/';
if (empty($scheme)) { if (empty($scheme)) {
$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme')); $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));
} }
$info = [ $info = [