public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

ccache, misc: fixes

Browse Source 
feeds: start PDO transition
This commit is contained in:
Andrew Dolgov
2017-12-01 19:42:02 +03:00
parent 1271407eea
commit cc9450c309
5 changed files with 125 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/controls.php
View File

@@ -95,7 +95,7 @@ function print_feed_multi_select($id, $default_ids = [],
c2.parent_cat = ttrss_feed_categories.id) AS num_children
FROM ttrss_feed_categories
WHERE owner_uid = :uid AND
(parent_cat = :root_id OR :root_id IS NULL AND parent_cat IS NULL) ORDER BY title");
(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
@@ -189,7 +189,7 @@ function print_feed_cat_select($id, $default_id,
c2.parent_cat = ttrss_feed_categories.id) AS num_children
FROM ttrss_feed_categories
WHERE owner_uid = :uid AND
(parent_cat = :root_id OR :root_id IS NULL AND parent_cat IS NULL) ORDER BY title");
(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
$found = 0;
@@ -338,5 +338,4 @@ function print_label_select($name, $value, $attributes = "") {
print "</select>";
}
}

4
include/functions.php
View File

@@ -601,7 +601,7 @@
$u_sth = $pdo->prepare("SELECT pref_name
FROM ttrss_user_prefs WHERE owner_uid = :uid AND
profile = :profile OR (:profile IS NULL AND profile IS NULL)");
(profile = :profile OR (:profile IS NULL AND profile IS NULL))");
$u_sth->execute([':uid' => $uid, ':profile' => $profile]);
$active_prefs = array();
@@ -1957,7 +1957,7 @@
$pdo->beginTransaction();
$sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories
WHERE (:parent IS NULL AND parent_cat IS NULL OR parent_cat = :parent)
WHERE (parent_cat = :parent OR (:parent IS NULL AND parent_cat IS NULL))
AND title = :cat AND owner_uid = :uid");
$sth->execute([':parent' => $parent_cat_id, ':title' => $feed_cat, ':uid' => $_SESSION['uid']]);