summaryrefslogtreecommitdiff
path: root/core/controllers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-04-05 20:43:05 +0000
committerBharat Mediratta <bharat@menalto.com>2009-04-05 20:43:05 +0000
commitc936eebcf7c57cfca8c3ff2e7b97441351118640 (patch)
treed93f61cbcf2c4da4981dd0bc139c0bb18c762ffa /core/controllers
parenta2dd24d7cadfd8bcc1a89ea23d64bbe7713d038c (diff)
Don't do graphics detection in core_installer::install() because that
gets run at scaffolding::package() time, not on the target machine. Instead, create a core module variable to trigger running graphics::choose_default_toolkit() on the first admin login after install. Fixes ticket #206.
Diffstat (limited to 'core/controllers')
-rw-r--r--core/controllers/admin_graphics.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/controllers/admin_graphics.php b/core/controllers/admin_graphics.php
index 1624c896..6676a808 100644
--- a/core/controllers/admin_graphics.php
+++ b/core/controllers/admin_graphics.php
@@ -24,8 +24,8 @@ class Admin_Graphics_Controller extends Admin_Controller {
$view->content->available = "";
$tk = new ArrayObject(graphics::detect_toolkits(), ArrayObject::ARRAY_AS_PROPS);
- $active = module::get_var("core", "graphics_toolkit");
- foreach (array("gd", "imagemagick", "graphicsmagick") as $id) {
+ $active = module::get_var("core", "graphics_toolkit", "none");
+ foreach (array("gd", "imagemagick", "graphicsmagick", "none") as $id) {
if ($id == $active) {
$view->content->active = new View("admin_graphics_$id.html");
$view->content->active->tk = $tk;