Ignore:
Timestamp:
08/22/10 21:16:40 (9 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.2

Location:
extensions/Register_FluxBB/branches/2.2
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/Register_FluxBB/branches/2.2/include/functions.inc.php

    r6295 r6792  
    6666 
    6767  $o_default_user_group = pwg_db_fetch_assoc(pwg_query($query)); 
    68    
    69   $query = " 
     68 
     69// Check for FluxBB version 1.4.x and get the correct value 
     70  $query1 = " 
     71SELECT conf_value 
     72FROM ".FluxBB_CONFIG_TABLE." 
     73WHERE conf_name = 'o_default_timezone' 
     74;"; 
     75 
     76  $count1 = pwg_db_num_rows(pwg_query($query1)); 
     77 
     78// Check for FluxBB version 1.2.x and get the correct value 
     79  $query2 = " 
    7080SELECT conf_value 
    7181FROM ".FluxBB_CONFIG_TABLE." 
     
    7383;"; 
    7484 
    75   $o_server_timezone = pwg_db_fetch_assoc(pwg_query($query)); 
     85  $count2 = pwg_db_num_rows(pwg_query($query2)); 
     86   
     87  if ($count1 == 1 and $count2 == 0) 
     88  { 
     89    $o_default_timezone = pwg_db_fetch_assoc(pwg_query($query1)); 
     90  } 
     91  else if ($count1 == 0 and $count2 == 1) 
     92  { 
     93    $o_default_timezone = pwg_db_fetch_assoc(pwg_query($query2)); 
     94  } 
     95   
    7696   
    7797  $query = " 
     
    97117  password,  
    98118  email,  
    99   ". ( isset($o_server_timezone['conf_value']) ? 'timezone' : '' ) .", 
     119  ". ( isset($o_default_timezone['conf_value']) ? 'timezone' : '' ) .", 
    100120  ". ( isset($o_default_lang['conf_value']) ? 'language' : '' ) .", 
    101121  ". ( isset($o_default_style['conf_value']) ? 'style' : '' ) .", 
     
    109129  '".$password."',  
    110130        '".$adresse_mail."', 
    111   ". ( isset($o_server_timezone['conf_value']) ? "'".$o_server_timezone['conf_value']."'" : '' ) .", 
     131  ". ( isset($o_default_timezone['conf_value']) ? "'".$o_default_timezone['conf_value']."'" : '' ) .", 
    112132  ". ( isset($o_default_lang['conf_value']) ? "'".$o_default_lang['conf_value']."'" : '' ) .", 
    113133  ". ( isset($o_default_style['conf_value']) ? "'".$o_default_style['conf_value']."'" : '' ) .", 
  • extensions/Register_FluxBB/branches/2.2/main.inc.php

    r6310 r6792  
    22/* 
    33Plugin Name: Register FluxBB 
    4 Version: 2.2.3 
     4Version: 2.2.4 
    55Description: Link user registration from Piwigo to FluxBB forum (registration, password changing, deletion) - Original Nicco's NBC_LinkUser2PunBB plugin upgraded to Piwigo / Liez l'inscription des utilisateurs de Piwigo avec votre forum FluxBB - Portage du plugin NBC_LinkUser2PunBB de Nicco vers Piwigo 
    66Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=252 
     
    52522.2.3     - 23/05/10  - Bug 1674 re-fixed : Bad link fixed 
    5353                      - Re-adding of German language that was missed at last release :-( (Thx to duke) 
     54 
     552.2.4     - 22/08/10  - Bug 1812 fixed : Compliance with FluxBB 1.4 
    5456-------------------------------------------------------------------------------- 
    5557*/ 
Note: See TracChangeset for help on using the changeset viewer.