X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_db.php;h=e0cf39f31a89df601b5352608849228cfdd7ad90;hp=df41e73e7bd9cc31881ca8d916ffaf405f26e878;hb=429044ea83a1b151ad5b8b2e32a9886774bca2d8;hpb=afadeef5cc359b4b3cb8372de1d2424691787807 diff --git a/phpfspot_db.php b/phpfspot_db.php index df41e73..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 */ @@ -206,7 +214,7 @@ class PHPFSPOT_DB { $row = $this->db_fetch_object($result); break; case 'pdo': - $row = $result[0]; + $row = $result->fetch(); break; } return $row;