mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-35661 Check that plugin is installed before including settings.php

Browse Source
This commit is contained in:
Marina Glancy 2012-10-15 15:44:29 +08:00 committed by Dan Poltawski
parent 8cbd15a761
commit dddbbac3f7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pluginlib.php
View File

@ -2132,6 +2132,9 @@ class plugininfo_filter extends plugininfo_base {
public function get_settings_section_name() {
$globalstates = self::get_global_states();
if (!isset($globalstates[$this->name])) {
return parent::get_settings_section_name();
}
$legacyname = $globalstates[$this->name]->legacyname;
return 'filtersetting' . str_replace('/', '', $legacyname);
}
@ -2141,8 +2144,9 @@ class plugininfo_filter extends plugininfo_base {
$ADMIN = $adminroot; // may be used in settings.php
$filter = $this; // also can be used inside settings.php
$globalstates = self::get_global_states();
$settings = null;
if ($hassiteconfig && file_exists($this->full_path('filtersettings.php'))) {
if ($hassiteconfig && isset($globalstates[$this->name]) && file_exists($this->full_path('filtersettings.php'))) {
$section = $this->get_settings_section_name();
$settings = new admin_settingpage($section, $this->displayname,
'moodle/site:config', $this->is_enabled() === false);
@ -2323,8 +2327,9 @@ class plugininfo_mod extends plugininfo_base {
$module = $this; // also can be used inside settings.php
$section = $this->get_settings_section_name();
$modulesinfo = self::get_modules_info();
$settings = null;
if ($hassiteconfig && file_exists($this->full_path('settings.php'))) {
if ($hassiteconfig && isset($modulesinfo[$this->name]) && file_exists($this->full_path('settings.php'))) {
$settings = new admin_settingpage($section, $this->displayname,
'moodle/site:config', $this->is_enabled() === false);
include($this->full_path('settings.php')); // this may also set $settings to null