From 8ed5478bcf5944bfa9e2ebf8f55f30d7aaa71eb9 Mon Sep 17 00:00:00 2001
From: Michael Ackerman <michael@lumenlearning.com>
Date: Sun, 13 May 2018 22:28:36 -0700
Subject: [PATCH] Eliminated the need for devmode.php.

---
 config.php.dist  |  3 +++
 devmode.php.dist |  6 ------
 init.php         | 11 ++++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 devmode.php.dist

diff --git a/config.php.dist b/config.php.dist
index b190090915..822f05db68 100644
--- a/config.php.dist
+++ b/config.php.dist
@@ -4,6 +4,9 @@
 	//created automatically by install.php
   //(c) 2006 David Lippman
 
+  //uncomment the following line for development
+  //$GLOBALS['environment'] = 'development';
+
   //these settings must be editted before running dbsetup.php
   $dbserver = "localhost";  		//database server
   $dbname = "imas";			//database name
diff --git a/devmode.php.dist b/devmode.php.dist
deleted file mode 100644
index b6be4401f7..0000000000
--- a/devmode.php.dist
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-require_once(__DIR__ . '/vendor/autoload.php');
-
-require_once(__DIR__ . '/c3.php');
-
diff --git a/init.php b/init.php
index 9f4e7ae545..b98db4947d 100644
--- a/init.php
+++ b/init.php
@@ -1,10 +1,5 @@
 <?php
 
-// Development dependencies
-if (file_exists(__DIR__ . '/devmode.php')) {
-	require_once(__DIR__ . "/devmode.php");
-}
-
 require_once(__DIR__ . "/includes/sanitize.php");
 
 // Load site config.
@@ -18,6 +13,12 @@
 
 require_once(__DIR__ . "/config.php");
 
+// Development dependencies
+if (isset($GLOBALS['environment']) && 'development' == $GLOBALS['environment']) {
+	require_once(__DIR__ . '/vendor/autoload.php');
+	require_once(__DIR__ . '/c3.php');
+}
+
 // Store PHP sessions in the database.
 require_once(__DIR__ . "/includes/session.php");
 if (!isset($use_local_sessions)) {