Skip to content

Commit

Permalink
Or not. Forgot to add the actual "Hey, apply the db file" part to the…
Browse files Browse the repository at this point in the history
… installer.

Fixed opendcim#751
  • Loading branch information
samilliken committed Mar 31, 2016
1 parent 9abf7b0 commit bf208d1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
5 changes: 5 additions & 0 deletions db.inc.php-dist
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
session_start();
}

// Set to true if you want to skip the installer check
$devMode = false;

$dbhost = 'localhost';
$dbname = 'dcim';
$dbuser = 'dcim';
Expand All @@ -28,6 +31,8 @@
die();
}

// Make sure that you only have ONE of these authentication types uncommented. You will get an error if you
// try to define the same name twice.
if ( !defined( "AUTHENTICATION") ) {
define( "AUTHENTICATION", "Apache" );

Expand Down
7 changes: 7 additions & 0 deletions install.php
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,13 @@ function workdamnit($numeric=true,&$PreNamedPorts,&$PowerPorts,&$ConvertedCDUs){
// Rebuild the config table just in case.
$config->rebuild();
}
if($version=="4.1.1"){
// First apply the schema updates needed.
$results[]=applyupdate("db-4.1.1-to-4.2.sql");

// Rebuild the config table just in case.
$config->rebuild();
}
}

if($upgrade==true){ //If we're doing an upgrade don't call the rest of the installer.
Expand Down

0 comments on commit bf208d1

Please sign in to comment.