Merge pull request #7752 from kPherox/develop

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 9d7ee2b0923beeac4d95d97a79d20700887196ca..3571a77c165de564f633520b3b32f19386146dd1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -322,47 +322,6 @@ function get_app()
        return BaseObject::getApp();
 }
 
-/**
- * Return the provided variable value if it exists and is truthy or the provided
- * default value instead.
- *
- * Works with initialized variables and potentially uninitialized array keys
- *
- * Usages:
- * - defaults($var, $default)
- * - defaults($array, 'key', $default)
- *
- * @param array $args
- * @brief Returns a defaut value if the provided variable or array key is falsy
- * @return mixed
- * @deprecated since version 2019.06, use native coalesce operator (??) instead
- */
-function defaults(...$args)
-{
-       if (count($args) < 2) {
-               throw new BadFunctionCallException('defaults() requires at least 2 parameters');
-       }
-       if (count($args) > 3) {
-               throw new BadFunctionCallException('defaults() cannot use more than 3 parameters');
-       }
-       if (count($args) === 3 && is_null($args[1])) {
-               throw new BadFunctionCallException('defaults($arr, $key, $def) $key is null');
-       }
-
-       // The default value always is the last argument
-       $return = array_pop($args);
-
-       if (count($args) == 2 && is_array($args[0]) && !empty($args[0][$args[1]])) {
-               $return = $args[0][$args[1]];
-       }
-
-       if (count($args) == 1 && !empty($args[0])) {
-               $return = $args[0];
-       }
-
-       return $return;
-}
-
 /**
  * @brief Used to end the current process, after saving session state.
  * @deprecated
@@ -527,7 +486,7 @@ function is_site_admin()
 
        $adminlist = explode(',', str_replace(' ', '', $admin_email));
 
-       return local_user() && $admin_email && in_array(defaults($a->user, 'email', ''), $adminlist);
+       return local_user() && $admin_email && in_array($a->user['email'] ?? '', $adminlist);
 }
 
 function explode_querystring($query)