aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2013-06-16 12:17:59 +0000
committerflop25 <flop25@piwigo.org>2013-06-16 12:17:59 +0000
commitdae0cd122a0d883d407efa73cf82dad601d027a9 (patch)
tree923c12d566600569a66e0f86a388441ed2020c16
parent7850d828d83d54675ae5d54e0f96114c66059c42 (diff)
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
-rw-r--r--admin/include/themes.class.php9
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);