Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

This commit is contained in:
Shish 2018-11-11 16:44:40 +00:00
commit e8bfba2098

View File

@ -42,8 +42,8 @@ class Rule34 extends Extension {
}
public function onUserPageBuilding(UserPageBuildingEvent $event) {
global $database, $user;
if($user->can("change_setting")) {
global $database, $user, $config;
if($user->can("change_setting") && $config->get_bool('r34_comic_integration')) {
$current_state = bool_escape($database->get_one("SELECT comic_admin FROM users WHERE id=?", array($event->display_user->id)));
$this->theme->show_comic_changer($event->display_user, $current_state);
}