valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix missing DB object when instantiated to import opml

This commit is contained in:
Andrew Dolgov 2013-04-18 23:19:14 +04:00
parent 7f1113a56a
commit 1f29443530
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend.php
View File

@ -120,7 +120,7 @@
if ($override) { if ($override) {
$handler = $override; $handler = $override;
} else { } else {
$handler = new $op(Db::get(), $_REQUEST); $handler = new $op($_REQUEST);
} }
if ($handler && implements_interface($handler, 'IHandler')) { if ($handler && implements_interface($handler, 'IHandler')) {

4
classes/handler.php
View File

@ -3,8 +3,8 @@ class Handler implements IHandler {
protected $dbh; protected $dbh;
protected $args; protected $args;
function __construct($dbh, $args) { function __construct($args) {
$this->dbh = $dbh; $this->dbh = Db::get();
$this->args = $args; $this->args = $args;
} }

2
opml.php
View File

@ -24,7 +24,7 @@
if (db_num_rows($result) == 1) { if (db_num_rows($result) == 1) {
$owner_uid = db_fetch_result($result, 0, "owner_uid"); $owner_uid = db_fetch_result($result, 0, "owner_uid");
$opml = new Opml( $_REQUEST); $opml = new Opml($_REQUEST);
$opml->opml_export("", $owner_uid, true, false); $opml->opml_export("", $owner_uid, true, false);
} else { } else {

2
public.php
View File

@ -42,7 +42,7 @@
if ($override) { if ($override) {
$handler = $override; $handler = $override;
} else { } else {
$handler = new Handler_Public(Db::get(), $_REQUEST); $handler = new Handler_Public($_REQUEST);
} }
if (implements_interface($handler, "IHandler") && $handler->before($method)) { if (implements_interface($handler, "IHandler") && $handler->before($method)) {

2
update.php
View File

@ -308,7 +308,7 @@
$_REQUEST = $filter; $_REQUEST = $filter;
$_SESSION["uid"] = $owner_uid; $_SESSION["uid"] = $owner_uid;
$filters = new Pref_Filters( $_REQUEST); $filters = new Pref_Filters($_REQUEST);
$filters->add(); $filters->add();
} }
} }