Merge r6318 from trunk to branch 2.1.

$themeconf['id'] hard coded in template class

git-svn-id: http://piwigo.org/svn/branches/2.1@6319 68402e56-0260-453c-a942-63ccdbb3a9ee

include/template.class.php

@@ -135,6 +135,7 @@ class Template {
     {
       $tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );
     }
+    $themeconf['id'] = $theme;
     $this->smarty->append('themes', $tpl_var);
     $this->smarty->append('themeconf', $themeconf, true);
   }