Don't show global options item if editing horde options

diff --git a/framework/Core/lib/Horde/Core/Prefs/Ui.php b/framework/Core/lib/Horde/Core/Prefs/Ui.php
index 054884a..9336d8a 100644 (file)
--- a/framework/Core/lib/Horde/Core/Prefs/Ui.php
+++ b/framework/Core/lib/Horde/Core/Prefs/Ui.php
@@ -568,7 +568,7 @@ class Horde_Core_Prefs_Ui
         /* Show the current application and a form for switching
          * applications. */
         $t = clone $base_ui;
-        $t->set('horde', !empty($apps['horde']));
+        $t->set('horde', !empty($apps['horde']) && ($this->app != 'horde'));
         unset($apps['horde'], $apps[$this->app]);
         $tmp = array();
         foreach ($apps as $key => $val) {

diff --git a/horde/templates/prefs/app.html b/horde/templates/prefs/app.html
index 094a719..f4c09ec 100644 (file)
--- a/horde/templates/prefs/app.html
+++ b/horde/templates/prefs/app.html
@@ -5,8 +5,8 @@
   <span class="smallheader rightFloat">
    <select id="app" name="app">
     <option value=""><gettext>Edit Options for</gettext>:</option>
-<if:horde>
     <option value="" disabled="disabled">- - - - - - - - -</option>
+<if:horde>
     <option value="horde"><gettext>Global Options</gettext></option>
     <option value="" disabled="disabled">- - - - - - - - -</option>
 </if:horde>