Merge commit '1826e383ecf501302974132fd443cf1ca06e10f6' into v0.10

[github/shaarli/Shaarli.git] / application / config / ConfigPlugin.php

diff --git a/application/config/ConfigPlugin.php b/application/config/ConfigPlugin.php
index 61a594d3c0e6f75b1bacd21689e6a0d335cbef6f..dbb249374a7262053b5e03000d38b746c9772563 100644 (file)
--- a/application/config/ConfigPlugin.php
+++ b/application/config/ConfigPlugin.php
@@ -1,5 +1,6 @@
 <?php
-namespace Shaarli\Config;
+
+use Shaarli\Config\Exception\PluginConfigOrderException;
 
 /**
  * Plugin configuration helper functions.
@@ -33,8 +34,7 @@ function save_plugin_config($formData)
         // If there is no order, it means a disabled plugin has been enabled.
         if (isset($formData['order_' . $key])) {
             $plugins[(int) $formData['order_' . $key]] = $key;
-        }
-        else {
+        } else {
             $newEnabledPlugins[] = $key;
         }
     }
@@ -110,17 +110,3 @@ function load_plugin_parameter_values($plugins, $conf)
 
     return $out;
 }
-
-/**
- * Exception used if an error occur while saving plugin configuration.
- */
-class PluginConfigOrderException extends \Exception
-{
-    /**
-     * Construct exception.
-     */
-    public function __construct()
-    {
-        $this->message = 'An error occurred while trying to save plugins loading order.';
-    }
-}