Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 02:29:08 +0000 (14:29 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 02:29:08 +0000 (14:29 +1200)
Conflicts:
admin/cli/install.php

1  2 
admin/cli/install.php
install.php

@@@ -150,7 -151,7 +151,8 @@@ $CFG->docroot              = 'http://do
  $CFG->running_installer    = true;
  $CFG->early_install_lang   = true;
  $CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
 +$CFG->developerdebug       = true;
+ $CFG->dboptions            = array();
  
  $parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
  $CFG->admin                = array_pop($parts);
diff --cc install.php
Simple merge