aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-08-31 19:38:38 +0000
committerrvelices <rv-github@modusoptimus.com>2012-08-31 19:38:38 +0000
commit7d64be73ab952c068643bc2a066b6db07e59cbc7 (patch)
tree742e62be95cfffb3bb82638865358d759bc3f816
parenta2f73718d9588a2b6185e73aa683cecd9f990363 (diff)
merge -r17681 from trunk to branch 2.4 - bug 2686 : multi size with diacritical file names not generated
git-svn-id: http://piwigo.org/svn/branches/2.4@17682 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--i.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/i.php b/i.php
index 7a74fcb88..415a9168d 100644
--- a/i.php
+++ b/i.php
@@ -416,6 +416,8 @@ catch (Exception $e)
{
ilog("db error", $e->getMessage());
}
+pwg_db_check_charset();
+
list($conf['derivatives']) = pwg_db_fetch_row(pwg_query('SELECT value FROM '.$prefixeTable.'config WHERE param=\'derivatives\''));
ImageStdParams::load_from_db();