Changeset 5982 for trunk/admin
- Timestamp:
- Apr 28, 2010, 4:28:05 PM (14 years ago)
- Location:
- trunk/admin/include
- Files:
-
- 2 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 ?> -
trunk/admin/include/functions_upgrade.php
r5387 r5982 77 77 78 78 $standard_plugins = array( 79 'add_index',80 'admin_advices',81 79 'admin_multi_view', 82 80 'c13y_upgrade', … … 222 220 try 223 221 { 224 $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], 225 $conf['db_password'], $conf['db_base']); 222 $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']); 223 if ($pwg_db_link) 224 { 225 pwg_db_check_version(); 226 } 226 227 } 227 228 catch (Exception $e) … … 231 232 } 232 233 234 /** 235 * Get languages defined in the language directory 236 */ 237 function get_fs_languages($target_charset = null) 238 { 239 if ( empty($target_charset) ) 240 { 241 $target_charset = get_pwg_charset(); 242 } 243 $target_charset = strtolower($target_charset); 244 245 $dir = opendir(PHPWG_ROOT_PATH.'language'); 246 247 while ($file = readdir($dir)) 248 { 249 $path = PHPWG_ROOT_PATH.'language/'.$file; 250 if (!is_link($path) and is_dir($path) and file_exists($path.'/iso.txt')) 251 { 252 list($language_name) = @file($path.'/iso.txt'); 253 254 $languages[$file] = convert_charset($language_name, $target_charset); 255 } 256 } 257 closedir($dir); 258 @asort($languages); 259 260 return $languages; 261 } 262 233 263 ?>
Note: See TracChangeset
for help on using the changeset viewer.