fix missing DB object when instantiated to import opml

remotes/origin/jsonfeed-test-branch
Andrew Dolgov 10 years ago
parent 7f1113a56a
commit 1f29443530
  1. 2
      backend.php
  2. 4
      classes/handler.php
  3. 2
      opml.php
  4. 2
      public.php
  5. 2
      update.php

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

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

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

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

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

Loading…
Cancel
Save