diff options
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | js/FeedTree.js | 2 | ||||
| -rwxr-xr-x | update.php | 1 | ||||
| -rwxr-xr-x | update_daemon2.php | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/include/functions.php b/include/functions.php index 0148d069d..43138a1f9 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1851,6 +1851,8 @@ } break; } + + return false; } function getFeedTitle($link, $id, $cat = false) { diff --git a/js/FeedTree.js b/js/FeedTree.js index bb50d6fbb..fbddb708f 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -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]; diff --git a/update.php b/update.php index 4c5bede0b..f5fa9e569 100755 --- a/update.php +++ b/update.php @@ -13,6 +13,7 @@ require_once "sanity_check.php"; require_once "db.php"; require_once "db-prefs.php"; + require_once "errorhandler.php"; if (!defined('PHP_EXECUTABLE')) define('PHP_EXECUTABLE', '/usr/bin/php'); diff --git a/update_daemon2.php b/update_daemon2.php index c6e215a29..8e1917b6f 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -20,6 +20,7 @@ require_once "config.php"; require_once "db.php"; require_once "db-prefs.php"; + require_once "errorhandler.php"; // defaults define('PURGE_INTERVAL', 3600); // seconds |