diff --git a/.travis.yml b/.travis.yml index 765348126..8b02103be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,6 @@ language: php php: - 5.4 - - 5.5 - -matrix: - allow_failures: - - php: 5.5 before_script: - sudo pecl install channel://pecl.php.net/pthreads-0.0.42 diff --git a/src/API/BanAPI.php b/src/API/BanAPI.php index 2fb16f0f7..36712a642 100644 --- a/src/API/BanAPI.php +++ b/src/API/BanAPI.php @@ -138,7 +138,7 @@ class BanAPI{ $output .= "Player \"$user\" added to white-list\n"; break; case "reload": - $this->whitelist = $this->load(FILE_PATH."white-list.txt", CONFIG_LIST); + $this->whitelist = new Config(FILE_PATH."white-list.txt", CONFIG_LIST); break; case "list": $output .= "White-list: ".implode(", ", $this->whitelist->getAll(true))."\n";