Merge pull request #656 from ArthurHoaro/v0.8.0

[github/shaarli/Shaarli.git] / application / PluginManager.php

diff --git a/application/PluginManager.php b/application/PluginManager.php
index dca7e63e571621461c72e64e3b42b0c2cd29fea2..1e132a7f652c78aa077a86ed3c1013ad58b7c95b 100644 (file)
--- a/application/PluginManager.php
+++ b/application/PluginManager.php
@@ -185,7 +185,11 @@ class PluginManager
                     continue;
                 }
 
-                $metaData[$plugin]['parameters'][$param] = '';
+                $metaData[$plugin]['parameters'][$param]['value'] = '';
+                // Optional parameter description in parameter.PARAM_NAME=
+                if (isset($metaData[$plugin]['parameter.'. $param])) {
+                    $metaData[$plugin]['parameters'][$param]['desc'] = $metaData[$plugin]['parameter.'. $param];
+                }
             }
         }
 
@@ -210,4 +214,4 @@ class PluginFileNotFoundException extends Exception
     {
         $this->message = 'Plugin "'. $pluginName .'" files not found.';
     }
-}
\ No newline at end of file
+}