Changes in [2905:a7a0df6048be:2906:6e7e433ef6d3]

Files:

• Makefile (modified) (1 diff)
• admin/preferences.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• plugins/themeEditor/_define.php (modified) (1 diff)
• plugins/themeEditor/class.themeEditor.php (modified) (3 diffs)

Makefile

@@ -67 +67 @@
      find ./$(DIST)/ -type d -name '.git' | xargs -r rm -rf
      find ./$(DIST)/ -type f -name '.*ignore' | xargs -r rm -rf
+     find ./$(DIST)/ -type f -name '.flow' | xargs -r rm -rf
 
      ## Create digest

admin/preferences.php

@@ -352 +352 @@
 );
 
-if (!empty($_GET['upd'])) {
-     dcPage::success(__('Personal information has been successfully updated.'));
-}
-if (!empty($_GET['updated'])) {
-     dcPage::success(__('Personal options has been successfully updated.'));
-}
-if (!empty($_GET['db-updated'])) {
-     dcPage::success(__('Dashboard options has been successfully updated.'));
-}
-if (!empty($_GET['append'])) {
-     dcPage::success(__('Favorites have been successfully added.'));
-}
-if (!empty($_GET['neworder'])) {
-     dcPage::success(__('Favorites have been successfully updated.'));
-}
-if (!empty($_GET['removed'])) {
-     dcPage::success(__('Favorites have been successfully removed.'));
-}
-if (!empty($_GET['replaced'])) {
-     dcPage::success(__('Default favorites have been successfully updated.'));
-}
-
 # User profile
 echo '<div class="multi-part" id="user-profile" title="'.__('My profile').'">';

inc/prepend.php

@@ -140 +140 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.7.3');
+define('DC_VERSION','2.8-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

plugins/themeEditor/_define.php

@@ -16 +16 @@
      /* Description*/         "Theme Editor",
      /* Author */             "Olivier Meunier",
-     /* Version */            '1.1',
+     /* Version */            '1.2',
      array(
           'type'         =>        'plugin'

plugins/themeEditor/class.themeEditor.php

@@ -20 +20 @@
      protected $tplset_theme;
 
+     protected $parent_name;
      protected $tplset_name;
 
@@ -38 +39 @@
                if ($parent_theme) {
                     $this->parent_theme = path::real($this->core->blog->themes_path.'/'.$parent_theme);
+                    $this->parent_name = $parent_theme;
                }
                $tplset = $this->core->themes->moduleInfo($this->core->blog->settings->system->theme,'tplset');
@@ -78 +80 @@
                }
                $list .= ($list_theme != '' ? sprintf('<li class="group-file">'.__('From theme:').'<ul>%s</ul></li>',$list_theme) : '');
-               $list .= ($list_parent != '' ? sprintf('<li class="group-file">'.__('From parent:').'<ul>%s</ul></li>',$list_parent) : '');
-               $list .= ($list_tpl != '' ? sprintf('<li class="group-file">'.__('From template set:').'<ul>%s</ul></li>',$list_tpl) : '');
+               $list .= ($list_parent != '' ? sprintf('<li class="group-file">'.__('From parent:').' %s<ul>%s</ul></li>',
+                    $this->parent_name,$list_parent) : '');
+               $list .= ($list_tpl != '' ? sprintf('<li class="group-file">'.__('From template set:').' %s<ul>%s</ul></li>',
+                    $this->tplset_name,$list_tpl) : '');
           } else {
                foreach ($files as $k => $v)