3 files changed, 18 insertions, 13 deletions

diff --git a/lib/plugins/extension/action.php b/lib/plugins/extension/action.php
index 9dd1648ff..3f2ccaace 100644
--- a/lib/plugins/extension/action.php
+++ b/lib/plugins/extension/action.php
@@ -32,16 +32,17 @@ class action_plugin_extension extends DokuWiki_Action_Plugin {
         global $USERINFO;
         global $INPUT;
 
+
+        if($event->data != 'plugin_extension') return;
+        $event->preventDefault();
+        $event->stopPropagation();
+
         if(empty($_SERVER['REMOTE_USER']) || !auth_isadmin($_SERVER['REMOTE_USER'], $USERINFO['grps'])){
             http_status(403);
             echo 'Forbidden';
             exit;
         }
 
-        if($event->data != 'plugin_extension') return;
-        $event->preventDefault();
-        $event->stopPropagation();
-
         header('Content-Type: text/html; charset=utf-8');
 
         $ext = $INPUT->str('ext');
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 8cc303fbe..01a5c516a 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -406,7 +406,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         $return .= ($extension->getTypes() ? hsc(implode(', ', $extension->getTypes())) : $default);
         $return .= '</bdi></dd>';
 
-        if($extension->getCompatibleVersions()) {
+        if(!$extension->isBundled() && $extension->getCompatibleVersions()) {
             $return .= '<dt>'.$this->getLang('compatible').'</dt>';
             $return .= '<dd>';
             foreach ($extension->getCompatibleVersions() as $date => $version) {
@@ -539,20 +539,23 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
      * @return string The description of all relevant statusses
      */
     function make_status(helper_plugin_extension_extension $extension) {
-        $return = '';
+        $status = array();
+
+
         if ($extension->isInstalled()) {
-            $return .= $this->getLang('status_installed').' ';
+            $status[] = $this->getLang('status_installed');
             if ($extension->isProtected()) {
-                $return .= $this->getLang('status_protected').' ';
+                $status[] = $this->getLang('status_protected');
             } else {
-                $return .= $extension->isEnabled() ? $this->getLang('status_enabled').' ' : $this->getLang('status_disabled').' ';
+                $status[] = $extension->isEnabled() ? $this->getLang('status_enabled') : $this->getLang('status_disabled');
             }
         } else {
-            $return .= $this->getLang('status_not_installed').' ';
+            $status[] = $this->getLang('status_not_installed');
         }
-        $return .= !$extension->canModify() ? $this->getLang('status_unmodifiable').' ' : '';
-        $return .= $extension->isTemplate() ? $this->getLang('status_template') : $this->getLang('status_plugin');
-        return $return;
+        if(!$extension->canModify()) $status[] = $this->getLang('status_unmodifiable');
+        if($extension->isBundled()) $status[] = $this->getLang('status_bundled');
+        $status[] = $extension->isTemplate() ? $this->getLang('status_template') : $this->getLang('status_plugin');
+        return join(', ', $status);
     }
 
 }
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index c0550c951..5224f694a 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -65,6 +65,7 @@ $lang['status_disabled']              = 'disabled';
 $lang['status_unmodifiable']          = 'unmodifiable';
 $lang['status_plugin']                = 'plugin';
 $lang['status_template']              = 'template';
+$lang['status_bundled']               = 'bundled';
 
 $lang['msg_enabled']                  = 'Plugin %s enabled';
 $lang['msg_disabled']                 = 'Plugin %s disabled';