Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2009-10-19 23:30:12 +04:00
commit 0b202d8916
21 changed files with 2447 additions and 2351 deletions
locale
de_DE/LC_MESSAGES
fr_FR/LC_MESSAGES
hu_HU/LC_MESSAGES
it_IT/LC_MESSAGES
ja_JP/LC_MESSAGES
nb_NO/LC_MESSAGES
pt_BR/LC_MESSAGES
ru_RU/LC_MESSAGES
zh_CN/LC_MESSAGES
localized_js.php
modules

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -54,6 +54,7 @@ print T_js_decl("Changing category of selected feeds...");
print T_js_decl("Clearing feed..."); print T_js_decl("Clearing feed...");
print T_js_decl("Clearing selected feed..."); print T_js_decl("Clearing selected feed...");
print T_js_decl("Click to collapse category"); print T_js_decl("Click to collapse category");
print T_js_decl("Click to view");
print T_js_decl("comments"); print T_js_decl("comments");
print T_js_decl("Could not change feed URL."); print T_js_decl("Could not change feed URL.");
print T_js_decl("Could not display article (missing XML object)"); print T_js_decl("Could not display article (missing XML object)");
@ -86,6 +87,7 @@ print T_js_decl("Mark as read:");
print T_js_decl("Mark %d article(s) as read?"); print T_js_decl("Mark %d article(s) as read?");
print T_js_decl("Mark %d selected articles in %s as read?"); print T_js_decl("Mark %d selected articles in %s as read?");
print T_js_decl("Marking all feeds as read..."); print T_js_decl("Marking all feeds as read...");
print T_js_decl("New articles in «%s».");
print T_js_decl("New password cannot be blank."); print T_js_decl("New password cannot be blank.");
print T_js_decl("No article is selected."); print T_js_decl("No article is selected.");
print T_js_decl("No articles are selected."); print T_js_decl("No articles are selected.");

View File

@ -450,7 +450,8 @@
$ids = split(",", db_escape_string($_REQUEST["ids"])); $ids = split(",", db_escape_string($_REQUEST["ids"]));
$label_id = db_escape_string($_REQUEST["lid"]); $label_id = db_escape_string($_REQUEST["lid"]);
$label = label_find_caption($link, $label_id, $_SESSION["uid"]); $label = db_escape_string(label_find_caption($link, $label_id,
$_SESSION["uid"]));
print "<rpc-reply>"; print "<rpc-reply>";
print "<info-for-headlines>"; print "<info-for-headlines>";
@ -485,7 +486,8 @@
$ids = split(",", db_escape_string($_REQUEST["ids"])); $ids = split(",", db_escape_string($_REQUEST["ids"]));
$label_id = db_escape_string($_REQUEST["lid"]); $label_id = db_escape_string($_REQUEST["lid"]);
$label = label_find_caption($link, $label_id, $_SESSION["uid"]); $label = db_escape_string(label_find_caption($link, $label_id,
$_SESSION["uid"]));
print "<rpc-reply>"; print "<rpc-reply>";

View File

@ -61,6 +61,8 @@
/* Update filters that reference label being renamed */ /* Update filters that reference label being renamed */
$old_caption = db_escape_string($old_caption);
db_query($link, "UPDATE ttrss_filters SET db_query($link, "UPDATE ttrss_filters SET
action_param = '$caption' WHERE action_param = '$old_caption' action_param = '$caption' WHERE action_param = '$old_caption'
AND action_id = 7 AND action_id = 7