diff --git a/backup/moodle2/backup_settingslib.php b/backup/moodle2/backup_settingslib.php index e6fe3529c92..a8dd45d2940 100644 --- a/backup/moodle2/backup_settingslib.php +++ b/backup/moodle2/backup_settingslib.php @@ -46,7 +46,7 @@ class backup_filename_setting extends backup_generic_setting { /** * root setting to control if backup will include user information - * A lot of other settings are dependant of this (module's user info, + * A lot of other settings are dependent of this (module's user info, * grades user info, messages, blogs... */ class backup_users_setting extends backup_generic_setting {} diff --git a/backup/util/settings/base_setting.class.php b/backup/util/settings/base_setting.class.php index 1171b395dbc..561e132d6dc 100644 --- a/backup/util/settings/base_setting.class.php +++ b/backup/util/settings/base_setting.class.php @@ -196,7 +196,7 @@ abstract class base_setting { public function get_all_dependencies() { $dependencies = array_values($this->dependencies); foreach ($this->dependencies as &$dependency) { - $childdependencies = $dependency->get_dependant_setting()->get_all_dependencies(); + $childdependencies = $dependency->get_dependent_setting()->get_all_dependencies(); foreach ($childdependencies as $name=>&$childdependency) { $dependencies[] = $childdependency; } @@ -245,14 +245,14 @@ abstract class base_setting { * @param setting_dependency $dependency */ public function register_dependency(setting_dependency $dependency) { - if ($this->is_circular_reference($dependency->get_dependant_setting())) { + if ($this->is_circular_reference($dependency->get_dependent_setting())) { $a = new stdclass(); $a->alreadydependent = $this->name; $a->main = $dependentsetting->get_name(); throw new base_setting_exception('setting_circular_reference', $a); } - $this->dependencies[$dependency->get_dependant_setting()->get_name()] = $dependency; - $dependency->get_dependant_setting()->register_dependent_dependency($dependency); + $this->dependencies[$dependency->get_dependent_setting()->get_name()] = $dependency; + $dependency->get_dependent_setting()->register_dependent_dependency($dependency); } /** * Adds a dependency where this setting is dependent on another. @@ -330,7 +330,7 @@ abstract class base_setting { break; } $this->dependencies[$dependentsetting->get_name()] = $dependency; - $dependency->get_dependant_setting()->register_dependent_dependency($dependency); + $dependency->get_dependent_setting()->register_dependent_dependency($dependency); } // Protected API starts here diff --git a/backup/util/settings/setting_dependency.class.php b/backup/util/settings/setting_dependency.class.php index 310ef66985e..d69c86334b5 100644 --- a/backup/util/settings/setting_dependency.class.php +++ b/backup/util/settings/setting_dependency.class.php @@ -127,7 +127,7 @@ abstract class setting_dependency { * Gets the dependent setting * @return backup_setting */ - public function get_dependant_setting() { + public function get_dependent_setting() { return $this->dependentsetting; } /**