public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-15 11:15:57 +00:00
Code Issues Releases Wiki Activity

updating issue fix for schema 63 (2)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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)");
}
}
}