Merge commit 'origin/master' into nefformat

1 files changed, 11 insertions, 3 deletions

diff --git a/phpfspot_db.php b/phpfspot_db.php
index 807cf0f..e0cf39f 100644
--- a/phpfspot_db.php
+++ b/phpfspot_db.php
@@ -2,8 +2,9 @@
 
 /***************************************************************************
  *
- * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
- * All rights reserved
+ * phpfspot, presents your F-Spot photo collection in Web browsers.
+ *
+ * Copyright (c) by Andreas Unterkircher
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +22,11 @@
  *
  ***************************************************************************/
 
+/**
+ * PHPFSPOT_DB class
+ *
+ * @package phpfspot
+ */
 class PHPFSPOT_DB {
 
    private $db;
@@ -37,7 +43,9 @@ class PHPFSPOT_DB {
     */
    public function __construct($parent, $db_path)
    {
-      $this->parent = $parent;
+      global $phpfspot;
+
+      $this->parent = $phpfspot;
       $this->db_path = $db_path;
 
       /* We are starting disconnected */