1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 14:05:56 +00:00

Merge branch 'master' into css-feedtree-counter

Conflicts:
	tt-rss.css
This commit is contained in:
Andrew Dolgov
2013-05-07 15:36:14 +04:00
218 changed files with 24450 additions and 42954 deletions

View File

@@ -100,7 +100,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
_createTreeNode: function(args) {
var tnode = new dijit._TreeNode(args);
if (args.item.icon)
if (args.item.icon && args.item.icon[0])
tnode.iconNode.src = args.item.icon[0];
var id = args.item.id[0];