merge svn:23248 & svn:23247 from trunk to 2.5

feature:2925
new function theme_delete


git-svn-id: http://piwigo.org/svn/branches/2.5@23249 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 9 insertions, 0 deletions

diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index 654d220ef..c639aed7d 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -212,6 +212,15 @@ DELETE
           break;
         }
 
+        if (file_exists($file_to_include))
+        {
+          include($file_to_include);
+          if (function_exists('theme_delete'))
+          {
+            theme_delete($theme_id);
+          }
+        }
+
         if (!$this->deltree(PHPWG_THEMES_PATH.$theme_id))
         {
           $this->send_to_trash(PHPWG_THEMES_PATH.$theme_id);