diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 13:04:23 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 13:04:48 -0700 |
| commit | c1df782a75193d4ee33ec1d0be10739f9320705f (patch) | |
| tree | 1811dbfb84f645d67931e5741268bdd5fb7de8b2 /modules | |
| parent | 1da0551b3c7067da43334ba2afeaad5aca6e364e (diff) | |
Use an absolute url for the upgrader link. Also, clear the upgrade_now
site status message every time we go to Admin > Modules.
Fixes #1695.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/controllers/admin_modules.php | 6 | ||||
| -rw-r--r-- | modules/gallery/helpers/module.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php index 787785ea..b712d14f 100644 --- a/modules/gallery/controllers/admin_modules.php +++ b/modules/gallery/controllers/admin_modules.php @@ -19,6 +19,9 @@ */ class Admin_Modules_Controller extends Admin_Controller { public function index() { + // If modules need upgrading, this will get recreated in module::available() + site_status::clear("upgrade_now"); + $view = new Admin_View("admin.html"); $view->page_title = t("Modules"); $view->content = new View("admin_modules.html"); @@ -103,9 +106,6 @@ class Admin_Modules_Controller extends Admin_Controller { module::event("module_change", $changes); - // If modules need upgrading, this will get recreated - site_status::clear("upgrade_now"); - // @todo this type of collation is questionable from an i18n perspective if ($activated_names) { message::success(t("Activated: %names", array("names" => join(", ", $activated_names)))); diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php index 37f7f68a..4b7d4a5f 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -101,7 +101,7 @@ class module_Core { $m->locked = false; if ($m->active && $m->version != $m->code_version) { - site_status::warning(t("Some of your modules are out of date. <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::site("upgrader"))), "upgrade_now"); + site_status::warning(t("Some of your modules are out of date. <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::abs_site("upgrader"))), "upgrade_now"); } } |