Merge branch 'jason-napolitano-develop' into develop

codeigniter4 · Aug 28, 2019 · 960310f · 960310f
2 parents 7261a70 + 10ad52e
commit 960310f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/app/Common.php b/app/Common.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * The goal of this file is to allow developers a location
+ * where they can overwrite core procedural functions and
+ * replace them with their own. This file is loaded during
+ * the bootstrap process and is called during the frameworks
+ * execution.
+ *
+ * This can be looked at as a `master helper` file that is
+ * loaded early on, and may also contain additional functions
+ * that you'd like to use throughout your entire application
+ *
+ * @link: https://codeigniter4.github.io/CodeIgniter4/
+ */
diff --git a/system/bootstrap.php b/system/bootstrap.php
@@ -96,6 +96,13 @@
 	require_once APPPATH . 'Config/Constants.php';
 }
 
+// Let's see if an app/Common.php file exists
+if (file_exists(APPPATH . 'Common.php'))
+{
+	require_once APPPATH . 'Common.php';
+}
+
+// Require system/Common.php
 require_once SYSTEMPATH . 'Common.php';
 
 /*