Merge branch 'master' of https://github.com/ukko/kanboard into 1245_bug_with_subtask_timer

2 files changed, 29 insertions, 1 deletions

diff --git a/app/Model/Action.php b/app/Model/Action.php
index 87058cce..57bd5b0d 100644
--- a/app/Model/Action.php
+++ b/app/Model/Action.php
@@ -31,6 +31,28 @@ class Action extends Base
     const TABLE_PARAMS = 'action_has_params';
 
     /**
+     * Extended actions
+     *
+     * @access private
+     * @var array
+     */
+    private $actions = array();
+
+    /**
+     * Extend the list of default actions
+     *
+     * @access public
+     * @param  string  $className
+     * @param  string  $description
+     * @return Action
+     */
+    public function extendActions($className, $description)
+    {
+        $this->actions[$className] = $description;
+        return $this;
+    }
+
+    /**
      * Return the name and description of available actions
      *
      * @access public
@@ -62,6 +84,8 @@ class Action extends Base
             'TaskAssignColorLink' => t('Change task color when using a specific task link'),
         );
 
+        $values = array_merge($values, $this->actions);
+
         asort($values);
 
         return $values;
@@ -296,7 +320,7 @@ class Action extends Base
      */
     public function load($name, $project_id, $event)
     {
-        $className = '\Action\\'.$name;
+        $className = $name{0} !== '\\' ? '\Action\\'.$name : $name;
         return new $className($this->container, $project_id, $event);
     }
 
diff --git a/app/Model/File.php b/app/Model/File.php
index 7adab42b..1d44a415 100644
--- a/app/Model/File.php
+++ b/app/Model/File.php
@@ -54,6 +54,10 @@ class File extends Base
             $file = $this->getbyId($file_id);
             $this->objectStorage->remove($file['path']);
 
+            if ($file['is_image'] == 1) {
+                $this->objectStorage->remove($this->getThumbnailPath($file['path']));
+            }
+
             return $this->db->table(self::TABLE)->eq('id', $file['id'])->remove();
         }
         catch (ObjectStorageException $e) {