diff --git a/mod/filerm.php b/mod/filerm.php index b1f9f8d74b..9013dd62b4 100644 --- a/mod/filerm.php +++ b/mod/filerm.php @@ -12,7 +12,7 @@ function filerm_content(App $a) exit(); } - $term = XML::unescape(trim($_GET['term'])); + $term = XML::unescape(trim(defaults($_GET, 'term', ''))); $cat = XML::unescape(trim(defaults($_GET, 'cat', ''))); $category = (($cat) ? true : false); diff --git a/mod/follow.php b/mod/follow.php index abde4abd03..404c79ea10 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -60,7 +60,11 @@ function follow_content(App $a) } $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'); diff --git a/src/Model/Register.php b/src/Model/Register.php index c2dd96def5..8a03f379a6 100644 --- a/src/Model/Register.php +++ b/src/Model/Register.php @@ -25,7 +25,7 @@ class Register public static function getPending() { $stmt = DBA::p( - "SELECT `register`.*, `contact`.`name`, `user`.`email` + "SELECT `register`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`email` FROM `register` INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid` INNER JOIN `user` ON `register`.`uid` = `user`.`uid`" diff --git a/src/Object/Image.php b/src/Object/Image.php index 45c8bedeaf..66be78ad46 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -447,7 +447,7 @@ class Image return; } - $ort = $exif['IFD0']['Orientation']; + $ort = isset($exif['IFD0']['Orientation']) ? $exif['IFD0']['Orientation'] : 1; switch ($ort) { case 1: // nothing diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index b9600cc22e..29d7ab53c1 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -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. $uid = Profile::getThemeUid($a); $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')) { $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php'; require_once $schemefile; diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php index 9e3f610cd5..f3150b52f3 100644 --- a/view/theme/frio/php/scheme.php +++ b/view/theme/frio/php/scheme.php @@ -25,7 +25,7 @@ function get_scheme_info($scheme) $theme = \get_app()->getCurrentTheme(); $themepath = 'view/theme/' . $theme . '/'; 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 = [