Merge pull request #2 from pomf/master

e;

2 files changed, 0 insertions, 30 deletions

diff --git a/php b/php
new file mode 160000
+Subproject 5abbc323d7f64df5fcf16255db79de339dc7256
diff --git a/php/includes/database.inc.php b/php/includes/database.inc.php
deleted file mode 100644
index 7a1d4f9..0000000
--- a/php/includes/database.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Prepares a PDO connection between Pomf and a database server.
- *
- * @copyright Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-require_once 'settings.inc.php';
-
-/* NOTE: we don't have to unref the PDO because we're not long-running */
-$db = new PDO(POMF_DB_CONN, POMF_DB_USER, POMF_DB_PASS);