Changeset 20721


Ignore:
Timestamp:
02/12/13 12:37:34 (7 years ago)
Author:
mistic100
Message:

feature:65 fix fatal error at the end of the install process, remove unused file and function

Location:
trunk
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions_install.inc.php

    r20720 r20721  
    7070 
    7171/** 
    72  * Search for database engines available 
    73  * 
    74  * We search for functions_DATABASE_ENGINE.inc.php  
    75  * and we check if the connect function for that database exists  
    76  * 
    77  * @return array 
    78  */ 
    79 function available_engines() 
    80 { 
    81   $engines = array(); 
    82  
    83   $pattern = PHPWG_ROOT_PATH. 'include/dblayer/functions_%s.inc.php'; 
    84   include_once PHPWG_ROOT_PATH. 'include/dblayer/dblayers.inc.php'; 
    85  
    86   foreach ($dblayers as $engine_name => $engine) 
    87   { 
    88     if (file_exists(sprintf($pattern, $engine_name)))  
    89     { 
    90       $engines[$engine_name]['label'] = $engine['engine']; 
    91       $engines[$engine_name]['available'] = false; 
    92  
    93       if (isset($engine['function_available']) 
    94           && function_exists($engine['function_available'])) 
    95       { 
    96         $engines[$engine_name]['available'] = true; 
    97       } 
    98       elseif (isset($engine['class_available'])  
    99               && class_exists($engine['class_available'])) 
    100       { 
    101         $engines[$engine_name]['available'] = true; 
    102       }  
    103     } 
    104   } 
    105  
    106   if ($engines['sqlite']['available'] and !$engines['pdo-sqlite']['available']) 
    107   { 
    108     unset($engines['pdo-sqlite']); 
    109   } 
    110   elseif ($engines['pdo-sqlite']['available'] and !$engines['sqlite']['available']) 
    111   { 
    112     unset($engines['sqlite']); 
    113   } 
    114   elseif (DEFAULT_DB_SQLITE=='native') 
    115   { 
    116     unset($engines['pdo-sqlite']); 
    117   } 
    118   else 
    119   { 
    120     unset($engines['sqlite']); 
    121   } 
    122  
    123   return $engines; 
    124 } 
    125  
    126 /** 
    12772 * Automatically activate all core themes in the "themes" directory. 
    12873 * 
  • trunk/install.php

    r20707 r20721  
    312312      DEFAULT_PREFIX_TABLE, 
    313313      $prefixeTable, 
    314       $dblayer 
     314      'mysql' 
    315315      ); 
    316316    // We fill the tables with basic informations 
     
    319319      DEFAULT_PREFIX_TABLE, 
    320320      $prefixeTable, 
    321       $dblayer 
     321      'mysql' 
    322322      ); 
    323323 
     
    468468    session_name($conf['session_name']); 
    469469    session_set_cookie_params(0, cookie_path()); 
     470    register_shutdown_function('session_write_close'); 
     471     
    470472    $user = build_user(1, true); 
    471473    log_user($user['id'], false); 
Note: See TracChangeset for help on using the changeset viewer.