From 4f80b6095c3d44fa82e594d27d89cbf98c3c7042 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Thu, 18 Mar 2010 18:40:00 +0000
Subject: - 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
---
 admin/themes/clear/themeconf.inc.php   | 2 +-
 admin/themes/default/themeconf.inc.php | 3 ++-
 admin/themes/roma/themeconf.inc.php    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'admin')

diff --git a/admin/themes/clear/themeconf.inc.php b/admin/themes/clear/themeconf.inc.php
index e007a971d..a73ebbcec 100644
--- a/admin/themes/clear/themeconf.inc.php
+++ b/admin/themes/clear/themeconf.inc.php
@@ -1,6 +1,6 @@
 <?php
 $themeconf = array(
-  'theme'    => 'clear',
+  'name'    => 'clear',
   'parent'   => 'default',
   'admin_icon_dir' => 'admin/themes/clear/icon',
 );
diff --git a/admin/themes/default/themeconf.inc.php b/admin/themes/default/themeconf.inc.php
index 36352b2b2..9a6b8fe42 100644
--- a/admin/themes/default/themeconf.inc.php
+++ b/admin/themes/default/themeconf.inc.php
@@ -1,8 +1,9 @@
 <?php
 $themeconf = array(
-  'theme'          => 'default',
+  'name'          => 'default',
   'icon_dir'       => 'themes/default/icon',
   'admin_icon_dir' => 'admin/themes/default/icon',
   'mime_icon_dir'  => 'themes/default/icon/mimetypes/',
+  'local_head'     => 'local_head.tpl',
 );
 ?>
diff --git a/admin/themes/roma/themeconf.inc.php b/admin/themes/roma/themeconf.inc.php
index 886ed60db..f6ec175e2 100644
--- a/admin/themes/roma/themeconf.inc.php
+++ b/admin/themes/roma/themeconf.inc.php
@@ -1,6 +1,6 @@
 <?php
 $themeconf = array(
-  'theme'  => 'roma',
+  'name'  => 'roma',
   'parent' => 'default',
 );
 ?>
-- 
cgit v1.2.3