Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Have get_arg never return null

Browse Source 
90% of places assume it will never return null, and they will break in
weird ways if it does return null
This commit is contained in:
Shish
2019-11-04 00:40:10 +00:00
parent fc7da5114f
commit d17e207984
19 changed files with 141 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ext/ext_manager/main.php
View File

@ -38,7 +38,7 @@ class ExtManager extends Extension
global $page, $user;
if ($event->page_matches("ext_manager")) {
if ($user->can(Permissions::MANAGE_EXTENSION_LIST)) {
if ($event->get_arg(0) == "set" && $user->check_auth_token()) {
if ($event->count_args() == 1 && $event->get_arg(0) == "set" && $user->check_auth_token()) {
if (is_writable("data/config")) {
$this->set_things($_POST);
log_warning("ext_manager", "Active extensions changed", "Active extensions changed");
@ -60,11 +60,14 @@ class ExtManager extends Extension
}
if ($event->page_matches("ext_doc")) {
$ext = $event->get_arg(0);
if (file_exists("ext/$ext/info.php")) {
$info = ExtensionInfo::get_by_key($ext);
$this->theme->display_doc($page, $info);
} else {
if($event->count_args() == 1) {
$ext = $event->get_arg(0);
if (file_exists("ext/$ext/info.php")) {
$info = ExtensionInfo::get_by_key($ext);
$this->theme->display_doc($page, $info);
}
}
else {
$this->theme->display_table($page, $this->get_extensions(false), false);
}
}