diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-11 12:07:45 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-11 12:07:45 +0100 |
| commit | 396af3853fc2d86b255db0f71e56a9f880ee2509 (patch) | |
| tree | 6358fd9e5f4479e8336c4e196869bf7795c2e76d /phpBB | |
| parent | 87aa611a8e4b944ad3ba2cde1d3256570c5f45af (diff) | |
| download | forums-396af3853fc2d86b255db0f71e56a9f880ee2509.tar forums-396af3853fc2d86b255db0f71e56a9f880ee2509.tar.gz forums-396af3853fc2d86b255db0f71e56a9f880ee2509.tar.bz2 forums-396af3853fc2d86b255db0f71e56a9f880ee2509.tar.xz forums-396af3853fc2d86b255db0f71e56a9f880ee2509.zip | |
[develop-olympus] Remove accidentally added trailing newlines.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 90440f74b8..2b19aa185d 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -275,4 +275,4 @@ define('ZEBRA_TABLE', $table_prefix . 'zebra'); // Additional tables -?> +?>
\ No newline at end of file diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 87a80f6a30..78d9067003 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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. $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><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 } @@ -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/acp/attachments.$phpEx", ); - + foreach ($lang_files as $lang_file) { if (!file_exists($lang_file)) @@ -1998,7 +1998,7 @@ class updater_db_tools 'VCHAR_CI' => '[varchar] (255)', 'VARBINARY' => '[varchar] (255)', ), - + 'mssqlnative' => array( 'INT:' => '[int]', 'BINT' => '[float]', @@ -2028,7 +2028,7 @@ class updater_db_tools 'VCHAR_CI' => '[varchar] (255)', 'VARBINARY' => '[varchar] (255)', ), - + 'oracle' => array( 'INT:' => 'number(%d)', 'BINT' => 'number(20)', @@ -2175,7 +2175,7 @@ class updater_db_tools case 'mssql_odbc': $this->sql_layer = 'mssql'; break; - + case 'mssqlnative': $this->sql_layer = 'mssqlnative'; break; @@ -3797,4 +3797,4 @@ class updater_db_tools } } -?> +?>
\ No newline at end of file |