Replace self::func() with <helper_name>::func() for all public APIs

and constants to make overloading easier.  Fixes #1510.
This commit is contained in:
Bharat Mediratta
2010-11-28 11:27:25 -08:00
parent 76b6daefaa
commit eb010554ff
15 changed files with 92 additions and 92 deletions

View File

@@ -35,7 +35,7 @@ class module_Core {
* @param integer $version
*/
static function set_version($module_name, $version) {
$module = self::get($module_name);
$module = module::get($module_name);
if (!$module->loaded()) {
$module->name = $module_name;
$module->active = $module_name == "gallery"; // only gallery is active by default
@@ -62,7 +62,7 @@ class module_Core {
* not found
*/
static function info($module_name) {
$module_list = self::available();
$module_list = module::available();
return isset($module_list->$module_name) ? $module_list->$module_name : false;
}
@@ -94,10 +94,10 @@ class module_Core {
$modules->$module_name =
new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
$m =& $modules->$module_name;
$m->installed = self::is_installed($module_name);
$m->active = self::is_active($module_name);
$m->installed = module::is_installed($module_name);
$m->active = module::is_active($module_name);
$m->code_version = $m->version;
$m->version = self::get_version($module_name);
$m->version = module::get_version($module_name);
$m->locked = false;
if ($m->active && $m->version != $m->code_version) {
@@ -107,7 +107,7 @@ class module_Core {
// Lock certain modules
$modules->gallery->locked = true;
$identity_module = self::get_var("gallery", "identity_provider", "user");
$identity_module = module::get_var("gallery", "identity_provider", "user");
$modules->$identity_module->locked = true;
$modules->ksort();
self::$available = $modules;
@@ -258,7 +258,7 @@ class module_Core {
call_user_func_array(array($installer_class, "activate"), array());
}
$module = self::get($module_name);
$module = module::get($module_name);
if ($module->loaded()) {
$module->active = true;
$module->save();
@@ -285,7 +285,7 @@ class module_Core {
call_user_func_array(array($installer_class, "deactivate"), array());
}
$module = self::get($module_name);
$module = module::get($module_name);
if ($module->loaded()) {
$module->active = false;
$module->save();
@@ -312,7 +312,7 @@ class module_Core {
}
graphics::remove_rules($module_name);
$module = self::get($module_name);
$module = module::get($module_name);
if ($module->loaded()) {
$module->delete();
}
@@ -532,6 +532,6 @@ class module_Core {
* @param string $module_name
*/
static function get_version($module_name) {
return self::get($module_name)->version;
return module::get($module_name)->version;
}
}