From 8e4dc39e33ff0e02deb37fa40f8c0d15d8b75f28 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 17 Mar 2009 05:06:24 +0000
Subject: [PATCH] Use message:warning to display a warning message if graphviz
 is not installed

---
 modules/developer/controllers/admin_developer.php | 8 ++++++--
 modules/developer/views/mptt_tree.html.php        | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/developer/controllers/admin_developer.php b/modules/developer/controllers/admin_developer.php
index fd6b5a25..6c5ec22b 100644
--- a/modules/developer/controllers/admin_developer.php
+++ b/modules/developer/controllers/admin_developer.php
@@ -115,9 +115,13 @@ class Admin_Developer_Controller extends Admin_Controller {
     $v->content = new View("mptt_tree.html");
 
     $v->content->tree = $this->_build_tree();
-    
-    $v->content->url = exec("which /usr/bin/dot") ? url::site("admin/developer/mptt_graph") : null;
 
+    if (exec("which /usr/bin/dot")) {
+      $v->content->url = url::site("admin/developer/mptt_graph");
+    } else {
+      $v->content->url = null;
+      message::warning(t("The package 'graphviz' is not installed, degrading to text view"));
+    }
     print $v;
   }
 
diff --git a/modules/developer/views/mptt_tree.html.php b/modules/developer/views/mptt_tree.html.php
index 6a6ca069..3fd2fa56 100644
--- a/modules/developer/views/mptt_tree.html.php
+++ b/modules/developer/views/mptt_tree.html.php
@@ -5,7 +5,6 @@
   </h2>
   <div id="gMPTT">
   <? if (empty($url)): ?>
-    <p class="gWarning"><?= t("The package 'graphviz' is not installed, degrading to text view") ?></p>
     <pre><?= $tree ?></pre>
   <? else: ?>
     <object type="image/svg+xml" data="<?= $url ?>" ><pre><?= $tree ?></pre></object>