Fix more PHP 8 warnings (bug #781)

vrana · Feb 12, 2021 · ccb7442 · ccb7442
1 parent eebda86
commit ccb7442
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
@@ -956,6 +956,7 @@ function navigation($missing) {
  echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
  }
  } else {
+ $tables = array();
  if ($_GET["ns"] !== "" && !$missing && DB != "") {
  $connection->select_db(DB);
  $tables = table_status('', true);

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
@@ -41,7 +41,7 @@ function add_invalid_login() {
 function check_invalid_login() {
  global $adminer;
  $invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
- $invalid = $invalids[$adminer->bruteForceKey()];
+ $invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
  $next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
  if ($next_attempt > 0) { //! do the same with permanent login
  auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));

diff --git a/changes.txt b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 4.8.1-dev:
+Fix more PHP 8 warnings (bug #781)
 
 Adminer 4.8.0 (released 2021-02-10):
 Support function default values in insert (bug #713)