replace router regexes with tags with a fixed chunk that takes any non-/ char. This...

[quix0rs-gnu-social.git] / lib / mysqlschema.php

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 4556953667d83c0586e1c2b34ce4f34c60dd605f..f9552c1dcdefd5cef37c8d6ad69ab59aaf18cb2a 100644 (file)
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -50,21 +50,6 @@ class MysqlSchema extends Schema
     static $_single = null;
     protected $conn = null;
 
-    /**
-     * Constructor. Only run once for singleton object.
-     */
-
-    protected function __construct()
-    {
-        // XXX: there should be an easier way to do this.
-        $user = new User();
-
-        $this->conn = $user->getDatabaseConnection();
-
-        $user->free();
-
-        unset($user);
-    }
 
     /**
      * Main public entry point. Use this to get
@@ -348,7 +333,7 @@ class MysqlSchema extends Schema
         }
 
         if (empty($name)) {
-            $name = "$table_".implode("_", $columnNames)."_idx";
+            $name = "{$table}_".implode("_", $columnNames)."_idx";
         }
 
         $res = $this->conn->query("ALTER TABLE $table ".