Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
This commit is contained in:
commit
97f31c4810
|
@ -4709,6 +4709,9 @@
|
|||
onclick=\"publishWithNote($id, '$note_escaped')\"
|
||||
alt='PubNote' title='".__('Publish article with a note')."'>";
|
||||
|
||||
} else {
|
||||
$tags_str = strip_tags($tags_str);
|
||||
print "<span id=\"ATSTR-$id\">$tags_str</span>";
|
||||
}
|
||||
print "</div>";
|
||||
print "<div clear='both'>$entry_comments</div>";
|
||||
|
|
|
@ -56,7 +56,7 @@ window.onload = init;
|
|||
<?php } ?>
|
||||
|
||||
<table>
|
||||
<tr><td align='right'><?php echo __("Login:") ?></td><td><input name="login"></td>
|
||||
<tr><td align='right'><?php echo __("Login:") ?></td><td><input type="text" name="login"></td>
|
||||
<tr><td align='right'><?php echo __("Password:") ?></td><td><input type="password" name="password"></tr>
|
||||
|
||||
<tr><td align="right"><?php echo __("Language:") ?></td>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
require_once "db-prefs.php";
|
||||
require_once "functions.php";
|
||||
|
||||
$GLOBALS['xmlrpc_internalencoding'] = "UTF-8";
|
||||
|
||||
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
|
||||
|
||||
if (!$link) {
|
||||
|
@ -91,12 +93,13 @@
|
|||
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
|
||||
$unread = getFeedUnread($link, $line["id"]);
|
||||
$unread = getFeedUnread($link, $line["id"], true);
|
||||
|
||||
$line_struct = new xmlrpcval(
|
||||
array(
|
||||
"title" => new xmlrpcval($line["title"]),
|
||||
"id" => new xmlrpcval($line["id"], "int")
|
||||
"id" => new xmlrpcval($line["id"], "int"),
|
||||
"unread" => new xmlrpcval($unread, "int")
|
||||
),
|
||||
"struct");
|
||||
|
||||
|
|
Loading…
Reference in New Issue