Better solution for previous commit. On Linux glob might return false. Check prior to casting to array.

From the PHP manual: on some systems it is impossible to distinguish
between empty match and an error.
This commit is contained in:
Flavio Copes
2016-01-17 23:08:19 +01:00
parent 73d8396553
commit 51c0a9301c

View File

@@ -96,10 +96,10 @@ class AdminPlugin extends Plugin
// check for existence of a user account // check for existence of a user account
$account_dir = $file_path = $this->grav['locator']->findResource('account://'); $account_dir = $file_path = $this->grav['locator']->findResource('account://');
$user_check = (array) glob($account_dir . '/*.yaml'); $user_check = glob($account_dir . '/*.yaml');
// If no users found, go to register // If no users found, go to register
if (count($user_check) == 0 || (count($user_check) == 1 && reset($user_check) == false)) { if ($user_check == false || count((array)$user_check) == 0) {
if (!$this->isAdminPath()) { if (!$this->isAdminPath()) {
$this->grav->redirect($this->base); $this->grav->redirect($this->base);
} }