archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 1502: bug corrected on guest setting page.

Browse source 
Remove $conf['default_theme'] from config file (useless).
Check if theme is still installed in pwg_get_themes.

git-svn-id: http://piwigo.org/svn/trunk@5306 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2010-03-24 01:36:28 +00:00
commit 2ad08fa8c1
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/themes/default/template/profile_content.tpl
View file

@ -59,7 +59,7 @@
<span class="property">
<label for="template">{'Interface theme'|@translate}</label>
</span>
{html_options id=template name=template options=$template_options selected=$template_selection}
{html_options id=template name=theme options=$template_options selected=$template_selection}
</li>
<li>
<span class="property">

3
include/config_default.inc.php
View file

@ -335,9 +335,6 @@ $conf['insensitive_case_logon'] = false;
// 'filename'
$conf['uniqueness_mode'] = 'md5sum';
// Define default theme for your gallery
$conf['default_theme'] = 'Sylvia';
// +-----------------------------------------------------------------------+
// | metadata |
// +-----------------------------------------------------------------------+

7
include/functions.inc.php
View file

@ -686,6 +686,8 @@ function url_is_remote($url)
*/
function get_pwg_themes()
{
global $conf;
$themes = array();
$query = '
@ -698,7 +700,10 @@ SELECT
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
$themes[ $row['id'] ] = $row['name'];
if (file_exists($conf['themes_dir'].'/'.$row['name'].'/'.'themeconf.inc.php'))
{
$themes[ $row['id'] ] = $row['name'];
}
}
// plugins want remove some themes based on user status maybe?