From cf4cef7d76d03a65032aa6bfe355ce8a09ebdd27 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 3 May 2013 14:29:07 +0800
Subject: [PATCH] MDL-39484 core: Undefined ostype during installation process

---
 admin/cli/install.php | 1 +
 install.php           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/cli/install.php b/admin/cli/install.php
index 8ea69e35c42..a84d5562588 100644
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -149,6 +149,7 @@ $CFG->httpswwwroot         = $CFG->wwwroot;
 $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
+$CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
 
 $parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
 $CFG->admin                = array_pop($parts);
diff --git a/install.php b/install.php
index 96e626966fb..7acf6d5d9e7 100644
--- a/install.php
+++ b/install.php
@@ -151,7 +151,7 @@ if (!empty($_POST)) {
     $config->dataroot = empty($distro->dataroot) ? null  : $distro->dataroot; // initialised later after including libs or by distro
 }
 
-// Fake some settings so that we can use selected functions from moodlelib.php and weblib.php
+// Fake some settings so that we can use selected functions from moodlelib.php, weblib.php and filelib.php.
 $CFG = new stdClass();
 $CFG->lang                 = $config->lang;
 $CFG->dirroot              = dirname(__FILE__);
@@ -168,6 +168,7 @@ $CFG->langlocalroot        = $CFG->dataroot.'/lang';
 $CFG->directorypermissions = isset($distro->directorypermissions) ? $distro->directorypermissions : 00777; // let distros set dir permissions
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
+$CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
 
 // Require all needed libs
 require_once($CFG->libdir.'/setuplib.php');