diff options
| author | Andrew Dolgov <[email protected]> | 2009-12-15 13:37:13 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2009-12-15 13:37:13 +0300 |
| commit | 97f31c4810f42e49394d43be6b8ce65a6b6f62d7 (patch) | |
| tree | d543864775004e8fd875c00dca85bf0f59d137e3 | |
| parent | 6061ca7624a2a173babe97f03e66a748a9dd2cde (diff) | |
| parent | 24ecbcae503da6a104ad38bf2b618c3f6024be64 (diff) | |
Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
| -rw-r--r-- | functions.php | 3 | ||||
| -rw-r--r-- | mobile/login_form.php | 2 | ||||
| -rw-r--r-- | xml-rpc.php | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/functions.php b/functions.php index 9d32e98f3..7980b68d8 100644 --- a/functions.php +++ b/functions.php @@ -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>"; diff --git a/mobile/login_form.php b/mobile/login_form.php index dd5b4acdc..4e414b5a0 100644 --- a/mobile/login_form.php +++ b/mobile/login_form.php @@ -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> diff --git a/xml-rpc.php b/xml-rpc.php index 624367fdf..4ad846784 100644 --- a/xml-rpc.php +++ b/xml-rpc.php @@ -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"); |