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

updating issue fix for schema 63 (2)

This commit is contained in:
Andrew Dolgov 2010-01-13 21:30:17 +03:00
parent e4c51a6ce9
commit f9aa6a898f
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db-prefs.php
View File

@ -21,11 +21,12 @@
}
if ($profile) {
$profile_qpart = "profile = '$profile'";
$profile_qpart = "profile = '$profile' AND";
} else {
$profile_qpart = "profile IS NULL";
$profile_qpart = "profile IS NULL AND";
}
if (get_schema_version($link) < 63) $profile_qpart = "";
if ($prefs_cache && !defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {
if ($_SESSION["prefs_cache"] && $_SESSION["prefs_cache"][$pref_name]) {
@ -39,7 +40,7 @@
FROM
ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
WHERE
$profile_qpart AND
$profile_qpart
ttrss_user_prefs.pref_name = '$pref_name' AND
ttrss_prefs_types.id = type_id AND
owner_uid = '$user_id' AND
@ -90,11 +91,13 @@
}
if ($profile) {
$profile_qpart = "profile = '$profile'";
$profile_qpart = "AND profile = '$profile'";
} else {
$profile_qpart = "profile IS NULL";
$profile_qpart = "AND profile IS NULL AND";
}
if (get_schema_version($link) < 63) $profile_qpart = "";
$result = db_query($link, "SELECT type_name
FROM ttrss_prefs,ttrss_prefs_types
WHERE pref_name = '$key' AND type_id = ttrss_prefs_types.id");
@ -119,7 +122,7 @@
db_query($link, "UPDATE ttrss_user_prefs SET
value = '$value' WHERE pref_name = '$key'
AND $profile_qpart
$profile_qpart
AND owner_uid = " . $_SESSION["uid"]);
$_SESSION["prefs_cache"] = array();

21
functions.php
View File

@ -1685,17 +1685,19 @@
if (!$profile) {
$profile = "NULL";
$profile_qpart = "profile IS NULL";
$profile_qpart = "AND profile IS NULL";
} else {
$profile_qpart = "profile = '$profile'";
$profile_qpart = "AND profile = '$profile'";
}
if (get_schema_version($link) < 63) $profile_qpart = "";
db_query($link, "BEGIN");
$result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
$u_result = db_query($link, "SELECT pref_name
FROM ttrss_user_prefs WHERE owner_uid = '$uid' AND $profile_qpart");
FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
$active_prefs = array();
@ -1707,9 +1709,16 @@
if (array_search($line["pref_name"], $active_prefs) === FALSE) {
// print "adding " . $line["pref_name"] . "<br>";
db_query($link, "INSERT INTO ttrss_user_prefs
(owner_uid,pref_name,value, profile) VALUES
('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
if (get_schema_version($link) < 63) {
db_query($link, "INSERT INTO ttrss_user_prefs
(owner_uid,pref_name,value) VALUES
('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
} else {
db_query($link, "INSERT INTO ttrss_user_prefs
(owner_uid,pref_name,value, profile) VALUES
('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
}
}
}