From 6542f86a8eb0d2188d26bb398e3e160087e48b15 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 19 May 2013 21:01:16 -0400
Subject: [PATCH] Add hoplite as a submodule and load some core files in
 init.php.

Roll hoplite from (null) to 632096709e0976f7c1a58dddce4dce9cb1699592.
---
 .gitmodules       |  3 +++
 includes/hoplite  |  1 +
 includes/init.php | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 includes/hoplite

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cfc1839
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "includes/hoplite"]
+	path = includes/hoplite
+	url = https://www.bluestatic.org/git/hoplite.git
diff --git a/includes/hoplite b/includes/hoplite
new file mode 160000
index 0000000..6320967
--- /dev/null
+++ b/includes/hoplite
@@ -0,0 +1 @@
+Subproject commit 632096709e0976f7c1a58dddce4dce9cb1699592
diff --git a/includes/init.php b/includes/init.php
index f07359b..b1818b1 100755
--- a/includes/init.php
+++ b/includes/init.php
@@ -80,13 +80,29 @@ $bugsys->datastore = array();
 
 class bugdar
 {
+	/*! @var \PDO The database connection instance. */
 	static $db = NULL;
 
+	/*! @var \hoplite\http\Input Input filter for the new stack. */
+	static $input = NULL;
+
 	static $options = array();
 	static $user = array();
 	static $datastore = array();
 }
 
+
+// ###################################################################
+// Initialize Hoplite concurrently with ISSO 2.x.
+
+define('HOPLITE_ROOT', dirname(__FILE__) . '/hoplite');
+
+require_once HOPLITE_ROOT . '/data/model.php';
+\hoplite\data\Model::set_db($db->dblink);
+
+require_once HOPLITE_ROOT . '/http/input.php';
+bugdar::$input = new \hoplite\http\Input(\hoplite\http\Input::TYPE_HTML);
+
 bugdar::$db = $db->dblink;
 
 // ###################################################################
-- 
2.22.5