- allow template class to be instantiated with an empty theme (in plugins for example)

- local_head must now be defined in the themeconf.inc.php otherwise not taken into account (avoid several calls to file_exists)
- renamed themeconf['theme'] to themeconf['name'] (this is what it is themeconf[theme] is confusing)

git-svn-id: http://piwigo.org/svn/trunk@5177 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 5 insertions, 4 deletions

diff --git a/themes/Sylvia/themeconf.inc.php b/themes/Sylvia/themeconf.inc.php
index 97af90564..d56f805ba 100644
--- a/themes/Sylvia/themeconf.inc.php
+++ b/themes/Sylvia/themeconf.inc.php
@@ -1,6 +1,6 @@
 <?php
 $themeconf = array(
-  'theme'         => 'Sylvia',
+  'name'         => 'Sylvia',
   'parent'        => 'default',
   'icon_dir'      => 'themes/Sylvia/icon',
   'mime_icon_dir' => 'themes/Sylvia/icon/mimetypes/',
diff --git a/themes/clear/themeconf.inc.php b/themes/clear/themeconf.inc.php
index 771a5be7b..1ce4817e9 100644
--- a/themes/clear/themeconf.inc.php
+++ b/themes/clear/themeconf.inc.php
@@ -1,6 +1,6 @@
 <?php
 $themeconf = array(
-  'theme'  => 'clear',
+  'name'  => 'clear',
   'parent' => 'default',
 );
 ?>
diff --git a/themes/dark/themeconf.inc.php b/themes/dark/themeconf.inc.php
index 48ed9577c..018b97338 100644
--- a/themes/dark/themeconf.inc.php
+++ b/themes/dark/themeconf.inc.php
@@ -1,6 +1,6 @@
 <?php
 $themeconf = array(
-  'theme'  => 'dark',
+  'name'  => 'dark',
   'parent' => 'default',
 );
 ?>
diff --git a/themes/default/themeconf.inc.php b/themes/default/themeconf.inc.php
index 0386fc4c6..50ab59819 100644
--- a/themes/default/themeconf.inc.php
+++ b/themes/default/themeconf.inc.php
@@ -1,7 +1,8 @@
 <?php
 $themeconf = array(
-  'theme'         => 'default',
+  'name'         => 'default',
   'icon_dir'      => 'themes/default/icon',
   'mime_icon_dir' => 'themes/default/icon/mimetypes/',
+  'local_head'    => 'local_head.tpl',
 );
 ?>