summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-09-17 09:18:03 +0300
committerAndrew Dolgov <[email protected]>2020-09-17 09:18:03 +0300
commite3adacc5885e46b014236195b2f1eb265b3cc14e (patch)
treef79e4c4721f027dfd50e5ba0b6b77dfef26bdbb8
parent16c86e2fc394935d64ff43ec89be6b7ae5a19e69 (diff)
fix several cases of Db class being invoked as wrong name (as DB)
-rwxr-xr-xclasses/article.php2
-rw-r--r--classes/counters.php2
-rwxr-xr-xclasses/feeds.php2
-rwxr-xr-xinclude/controls.php4
-rw-r--r--include/functions.php8
-rwxr-xr-xinclude/sanity_check.php2
6 files changed, 10 insertions, 10 deletions
diff --git a/classes/article.php b/classes/article.php
index 42f98a489..b189c663b 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -652,7 +652,7 @@ class Article extends Handler_Protected {
}
static function getLastArticleId() {
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$sth = $pdo->prepare("SELECT ref_id AS id FROM ttrss_user_entries
WHERE owner_uid = ? ORDER BY ref_id DESC LIMIT 1");
diff --git a/classes/counters.php b/classes/counters.php
index 4230fa4d4..4518fa9d2 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -42,7 +42,7 @@ class Counters {
array_push($ret, $cv);
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$sth = $pdo->prepare("SELECT fc.id,
SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
diff --git a/classes/feeds.php b/classes/feeds.php
index b3c73a58d..9c04ba137 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -2097,7 +2097,7 @@ class Feeds extends Handler_Protected {
static function feed_purge_interval($feed_id) {
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$sth = $pdo->prepare("SELECT purge_interval, owner_uid FROM ttrss_feeds
WHERE id = ?");
diff --git a/include/controls.php b/include/controls.php
index 8646ec15d..dc923e16a 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -74,7 +74,7 @@ function print_feed_multi_select($id, $default_ids = [],
$attributes = "", $include_all_feeds = true,
$root_id = null, $nest_level = 0) {
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
print_r(in_array("CAT:6",$default_ids));
@@ -180,7 +180,7 @@ function print_feed_cat_select($id, $default_id,
print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
}
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
if (!$root_id) $root_id = null;
diff --git a/include/functions.php b/include/functions.php
index c2cc4a292..bb7974f7f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -485,7 +485,7 @@
if (get_schema_version() < 63) $profile_qpart = "";
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$in_nested_tr = false;
try {
@@ -573,7 +573,7 @@
$_SESSION["uid"] = $user_id;
$_SESSION["auth_module"] = $auth_module;
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$sth = $pdo->prepare("SELECT login,access_level,pwd_hash FROM ttrss_users
WHERE id = ?");
$sth->execute([$user_id]);
@@ -662,7 +662,7 @@
function initialize_user($uid) {
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$sth = $pdo->prepare("insert into ttrss_feeds (owner_uid,title,feed_url)
values (?, 'Tiny Tiny RSS: Forum',
@@ -861,7 +861,7 @@
function get_schema_version($nocache = false) {
global $schema_version;
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
if (!$schema_version && !$nocache) {
$row = $pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
diff --git a/include/sanity_check.php b/include/sanity_check.php
index b0f7f7402..454d44883 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -105,7 +105,7 @@
}
if (SINGLE_USER_MODE && class_exists("PDO")) {
- $pdo = DB::pdo();
+ $pdo = Db::pdo();
$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");