tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Install now supports sending database version if available from the helper

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@105711 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sharvey 2010-05-26 05:08:26 +00:00 committed by Sam Minnee
parent 1e0e4758f4
commit 8869240b5a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install.php
View File

@ -916,12 +916,13 @@ class Installer extends InstallRequirements {
$phpVersion = urlencode(phpversion()); $phpVersion = urlencode(phpversion());
$encWebserver = urlencode($webserver); $encWebserver = urlencode($webserver);
$dbType = $config['db']['type'];
if($config['db']['type'] == 'MySQLDatabase') {
$conn = @mysql_connect($dbConfig['server'], null, null); // Try to determine the database version from the helper
$databaseVersion = urlencode('MySQLDatabase: ' . mysql_get_server_info()); $databaseVersion = '';
} else { $helper = $this->getDatabaseConfigurationHelper($dbType);
$databaseVersion = $config['db']['type']; if($helper && method_exists($helper, 'getDatabaseVersion')) {
$databaseVersion = urlencode($dbType . ': ' . $helper->getDatabaseVersion($config['db'][$dbType]));
} }
$url = "http://ss2stat.silverstripe.com/Installation/add?SilverStripe=$silverstripe_version&PHP=$phpVersion&Database=$databaseVersion&WebServer=$encWebserver"; $url = "http://ss2stat.silverstripe.com/Installation/add?SilverStripe=$silverstripe_version&PHP=$phpVersion&Database=$databaseVersion&WebServer=$encWebserver";