remove subselect from theme query, expand password range
This commit is contained in:
parent
eac46afbf7
commit
798f722b01
1 changed files with 8 additions and 7 deletions
|
@ -101,7 +101,7 @@
|
||||||
// db_query($link, "BEGIN");
|
// db_query($link, "BEGIN");
|
||||||
|
|
||||||
$result = db_query($link, "SELECT feed_url,id,
|
$result = db_query($link, "SELECT feed_url,id,
|
||||||
substring(last_updated,1,19) as last_updated,
|
SUBSTRING(last_updated,1,19) AS last_updated,
|
||||||
update_interval FROM ttrss_feeds WHERE owner_uid = '$user_id'
|
update_interval FROM ttrss_feeds WHERE owner_uid = '$user_id'
|
||||||
ORDER BY last_updated DESC");
|
ORDER BY last_updated DESC");
|
||||||
|
|
||||||
|
@ -712,7 +712,7 @@
|
||||||
function make_password($length = 8) {
|
function make_password($length = 8) {
|
||||||
|
|
||||||
$password = "";
|
$password = "";
|
||||||
$possible = "0123456789bcdfghjkmnpqrstvwxyz";
|
$possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ";
|
||||||
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
|
@ -816,9 +816,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_user_theme_path($link) {
|
function get_user_theme_path($link) {
|
||||||
$result = db_query($link, "SELECT theme_path FROM ttrss_themes
|
$result = db_query($link, "SELECT theme_path
|
||||||
WHERE id = (SELECT theme_id FROM ttrss_users
|
FROM
|
||||||
WHERE id = " . $_SESSION["uid"] . ")");
|
ttrss_themes,ttrss_users
|
||||||
|
WHERE ttrss_themes.id = theme_id AND ttrss_users.id = " . $_SESSION["uid"]);
|
||||||
if (db_num_rows($result) != 0) {
|
if (db_num_rows($result) != 0) {
|
||||||
return db_fetch_result($result, 0, "theme_path");
|
return db_fetch_result($result, 0, "theme_path");
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue