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 ss2stat URL not generated correctly (has NULL values)

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

6
install.php
View File

@ -901,7 +901,7 @@ class Installer extends InstallRequirements {
flush(); flush();
if(isset($_POST['stats'])) { if(isset($config['stats'])) {
if(file_exists('sapphire/silverstripe_version')) { if(file_exists('sapphire/silverstripe_version')) {
$sapphireVersionFile = file_get_contents('sapphire/silverstripe_version'); $sapphireVersionFile = file_get_contents('sapphire/silverstripe_version');
if(strstr($sapphireVersionFile, "/sapphire/trunk")) { if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
@ -917,11 +917,11 @@ class Installer extends InstallRequirements {
$phpVersion = urlencode(phpversion()); $phpVersion = urlencode(phpversion());
$encWebserver = urlencode($webserver); $encWebserver = urlencode($webserver);
if($type == 'MySQLDatabase') { if($config['db']['type'] == 'MySQLDatabase') {
$conn = @mysql_connect($dbConfig['server'], null, null); $conn = @mysql_connect($dbConfig['server'], null, null);
$databaseVersion = urlencode('MySQLDatabase: ' . mysql_get_server_info()); $databaseVersion = urlencode('MySQLDatabase: ' . mysql_get_server_info());
} else { } else {
$databaseVersion = $type; $databaseVersion = $config['db']['type'];
} }
$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";