Dev: Allow plugins to set message when success is false

LimeSurvey · Apr 26, 2016 · ef2957b · ef2957b · Shnoulle · Apr 27, 2016
1 parent 31590f2
commit ef2957b
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/application/controllers/admin/pluginmanager.php b/application/controllers/admin/pluginmanager.php
@@ -103,7 +103,16 @@ public function activate($id)
                     $iStatus = 1;
                 } else
                 {
-                    Yii::app()->user->setFlash('error', gT('Failed to activate the plugin.'));
+                    $customMessage = $result->get('message');
+                    if ($customMessage)
+                    {
+                        Yii::app()->user->setFlash('error', $customMessage);
+                    }
+                    else
+                    {
+                        Yii::app()->user->setFlash('error', gT('Failed to activate the plugin.'));
+                    }
+
                     $this->getController()->redirect(array('admin/pluginmanager/sa/index/'));
                 }
             }
@@ -139,7 +148,16 @@ public function deactivate($id)
                     $iStatus = 0;
                 } else
                 {
-                    Yii::app()->user->setFlash('error', gT('Failed to deactivate the plugin.'));
+                    $customMessage = $result->get('message');
+                    if ($customMessage)
+                    {
+                        Yii::app()->user->setFlash('error', $customMessage);
+                    }
+                    else
+                    {
+                        Yii::app()->user->setFlash('error', gT('Failed to activate the plugin.'));
+                    }
+
                     $this->getController()->redirect(array('admin/pluginmanager/sa/index/'));
                 }
             }