mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
[develop-olympus] Remove accidentally added trailing newlines.
This commit is contained in:
parent
87aa611a8e
commit
396af3853f
2 changed files with 8 additions and 8 deletions
|
@ -275,4 +275,4 @@ define('ZEBRA_TABLE', $table_prefix . 'zebra');
|
||||||
// Additional tables
|
// Additional tables
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$updates_to_version = '3.0.9-dev';
|
$updates_to_version = '3.0.8-RC1';
|
||||||
|
|
||||||
// Enter any version to update from to test updates. The version within the db will not be updated.
|
// Enter any version to update from to test updates. The version within the db will not be updated.
|
||||||
$debug_from_version = false;
|
$debug_from_version = false;
|
||||||
|
@ -477,7 +477,7 @@ else
|
||||||
|
|
||||||
<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
|
<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
|
||||||
|
|
||||||
<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&language=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
|
<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
@ -1672,7 +1672,7 @@ function change_database_data(&$no_updates, $version)
|
||||||
"{$phpbb_root_path}language/$lang_dir/install.$phpEx",
|
"{$phpbb_root_path}language/$lang_dir/install.$phpEx",
|
||||||
"{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx",
|
"{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx",
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($lang_files as $lang_file)
|
foreach ($lang_files as $lang_file)
|
||||||
{
|
{
|
||||||
if (!file_exists($lang_file))
|
if (!file_exists($lang_file))
|
||||||
|
@ -1998,7 +1998,7 @@ class updater_db_tools
|
||||||
'VCHAR_CI' => '[varchar] (255)',
|
'VCHAR_CI' => '[varchar] (255)',
|
||||||
'VARBINARY' => '[varchar] (255)',
|
'VARBINARY' => '[varchar] (255)',
|
||||||
),
|
),
|
||||||
|
|
||||||
'mssqlnative' => array(
|
'mssqlnative' => array(
|
||||||
'INT:' => '[int]',
|
'INT:' => '[int]',
|
||||||
'BINT' => '[float]',
|
'BINT' => '[float]',
|
||||||
|
@ -2028,7 +2028,7 @@ class updater_db_tools
|
||||||
'VCHAR_CI' => '[varchar] (255)',
|
'VCHAR_CI' => '[varchar] (255)',
|
||||||
'VARBINARY' => '[varchar] (255)',
|
'VARBINARY' => '[varchar] (255)',
|
||||||
),
|
),
|
||||||
|
|
||||||
'oracle' => array(
|
'oracle' => array(
|
||||||
'INT:' => 'number(%d)',
|
'INT:' => 'number(%d)',
|
||||||
'BINT' => 'number(20)',
|
'BINT' => 'number(20)',
|
||||||
|
@ -2175,7 +2175,7 @@ class updater_db_tools
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
$this->sql_layer = 'mssql';
|
$this->sql_layer = 'mssql';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'mssqlnative':
|
case 'mssqlnative':
|
||||||
$this->sql_layer = 'mssqlnative';
|
$this->sql_layer = 'mssqlnative';
|
||||||
break;
|
break;
|
||||||
|
@ -3797,4 +3797,4 @@ class updater_db_tools
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
Loading…
Add table
Reference in a new issue