Changeset 5982 for trunk/admin/include/functions_install.inc.php
- Timestamp:
- Apr 28, 2010, 4:28:05 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/functions_install.inc.php
r5781 r5982 34 34 * @return void 35 35 */ 36 function execute_sqlfile($filepath, $replaced, $replacing )36 function execute_sqlfile($filepath, $replaced, $replacing, $dblayer) 37 37 { 38 38 $sql_lines = file($filepath); … … 55 55 if (!preg_match('/^DROP TABLE/i', $query)) 56 56 { 57 global $install_charset_collate; 58 if ( !empty($install_charset_collate) ) 57 if ('mysql' == $dblayer) 59 58 { 60 59 if ( preg_match('/^(CREATE TABLE .*)[\s]*;[\s]*/im', $query, $matches) ) 61 60 { 62 $query = $matches[1].' '.$install_charset_collate.';';61 $query = $matches[1].' DEFAULT CHARACTER SET utf8'.';'; 63 62 } 64 63 } … … 126 125 127 126 /** 128 * Automatically activate all themes in the "themes" directory.127 * Automatically activate all core themes in the "themes" directory. 129 128 * 130 129 * @return void 131 130 */ 132 function activate_ all_themes()131 function activate_core_themes() 133 132 { 134 133 include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php'); … … 136 135 foreach ($themes->fs_themes as $theme_id => $fs_theme) 137 136 { 138 $themes->perform_action('activate', $theme_id); 137 if (in_array($theme_id, array('Sylvia', 'clear', 'dark'))) 138 { 139 $themes->perform_action('activate', $theme_id); 140 } 139 141 } 140 142 } … … 144 146 try 145 147 { 146 $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], 147 $_POST['dbpasswd'], $_POST['dbname']); 148 149 return $pwg_db_link; 148 $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], $_POST['dbpasswd'], $_POST['dbname']); 149 if ($pwg_db_link) 150 { 151 pwg_db_check_version(); 152 } 150 153 } 151 154 catch (Exception $e) … … 153 156 array_push( $errors, l10n($e->getMessage())); 154 157 } 155 return false;156 158 } 157 159 ?>
Note: See TracChangeset
for help on using the changeset viewer.