Merge pull request #2018 from fabrixxm/admin_theme_reload

Add 'Reload active themes' to admin

diff --git a/mod/admin.php b/mod/admin.php
index 6337e4608db045c9af5141121c180aff8339050f..f79e837b770c0ec003ec9e039d11a90b3179cb6d 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -557,10 +557,10 @@ function admin_page_site_post(&$a){
        set_config('system','old_pager', $old_pager);
        set_config('system','only_tag_search', $only_tag_search);
 
-       
+
        if ($rino==2 and !function_exists('mcrypt_create_iv')){
-               notice(t("RINO2 needs mcrypt php extension to work."));         
-       } else {        
+               notice(t("RINO2 needs mcrypt php extension to work."));
+       } else {
                set_config('system','rino_encrypt', $rino);
        }
 
@@ -1217,7 +1217,7 @@ function admin_page_plugins(&$a){
         * List plugins
         */
 
-    if (x($_GET,"a") && $_GET['a']=="r"){
+       if (x($_GET,"a") && $_GET['a']=="r"){
                check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/plugins', 'admin_themes', 't');
                reload_plugins();
                info("Plugins reloaded");
@@ -1252,6 +1252,7 @@ function admin_page_plugins(&$a){
                '$title' => t('Administration'),
                '$page' => t('Plugins'),
                '$submit' => t('Save Settings'),
+               '$reload' => t('Reload active plugins'),
                '$baseurl' => $a->get_baseurl(true),
                '$function' => 'plugins',
                '$plugins' => $plugins,
@@ -1438,6 +1439,22 @@ function admin_page_themes(&$a){
                ));
        }
 
+
+       // reload active themes
+       if (x($_GET,"a") && $_GET['a']=="r"){
+               check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/themes', 'admin_themes', 't');
+               if ($themes) {
+                       foreach($themes as $th) {
+                               if ($th['allowed']) {
+                                       uninstall_theme($th['name']);
+                                       install_theme($th['name']);
+                               }
+                       }
+               }
+               info("Themes reloaded");
+               goaway($a->get_baseurl().'/admin/themes');
+       }
+
        /**
         * List themes
         */
@@ -1449,11 +1466,13 @@ function admin_page_themes(&$a){
                }
        }
 
+
        $t = get_markup_template("admin_plugins.tpl");
        return replace_macros($t, array(
                '$title' => t('Administration'),
                '$page' => t('Themes'),
                '$submit' => t('Save Settings'),
+               '$reload' => t('Reload active themes'),
                '$baseurl' => $a->get_baseurl(true),
                '$function' => 'themes',
                '$plugins' => $xthemes,

diff --git a/view/templates/admin_plugins.tpl b/view/templates/admin_plugins.tpl
index 6577ab8eb0c6413aaa919eb9d8cf912c072c8b3c..6caa04a3a42dfc2228b2980294aac56459daec1c 100644 (file)
--- a/view/templates/admin_plugins.tpl
+++ b/view/templates/admin_plugins.tpl
@@ -1,7 +1,7 @@
 
 <div id='adminpage'>
        <h1>{{$title}} - {{$page}}</h1>
-               <a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{"Reload active plugins"|t}}</a>
+               <a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{$reload}}</a>
                <ul id='pluginslist'>
                {{foreach $plugins as $p}}
                        <li class='plugin {{$p.1}}'>