fix conflict in phpfspot_tmpl.php
[phpfspot.git] / phpfspot_db.php
index e5f1f0bd3bc1488c547658a6e62677bcd042c271..90fdb8cc17392088a0d83763b7508b940dc764ce 100644 (file)
  *
  ***************************************************************************/
 
  *
  ***************************************************************************/
 
+/**
+ * PHPFSPOT_DB class
+ * @package phpfspot
+ */
 class PHPFSPOT_DB {
 
    private $db;
 class PHPFSPOT_DB {
 
    private $db;
@@ -38,7 +42,9 @@ class PHPFSPOT_DB {
     */
    public function __construct($parent, $db_path)
    {
     */
    public function __construct($parent, $db_path)
    {
-      $this->parent = $parent;
+      global $phpfspot;
+
+      $this->parent = $phpfspot;
       $this->db_path = $db_path;
 
       /* We are starting disconnected */
       $this->db_path = $db_path;
 
       /* We are starting disconnected */