adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-10 10:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- corrects bugs due to deletion of configuration parameters default_lang,

Browse Source 
default_style (renamed to default_language and default_template),
  session_keyword

- in install.php, corrects bug to deletion of language keys :
  conf_general_webmaster, conf_general_webmaster_info and renaming of
  conf_general_mail


git-svn-id: http://piwigo.org/svn/trunk@518 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub
2004-09-07 19:29:42 +00:00
parent 21886493a7
commit 47a1e49c1e
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_session.inc.php
+1 -1
View File
@@ -35,7 +35,7 @@ function generate_key()
{
global $conf;
$md5 = md5( substr( microtime(), 2, 6 ).$conf['session_keyword'] );
$md5 = md5(substr(microtime(), 2, 6));
$init = '';
for ( $i = 0; $i < strlen( $md5 ); $i++ )
{
include/functions_user.inc.php
+2 -2
View File
@@ -213,8 +213,8 @@ function init_userprefs($userdata)
{
global $conf, $template, $lang, $lang_info;
$language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_lang'];
$style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_style'];
$language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language'];
$style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_template'];
if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )
{