still removing warnings

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_bookmarks.php b/wwwroot/inc/smarty/node_methodz/function.get_bookmarks.php
index 8744980f8dd40e5bd121ba10596f13a83004369c..44e1b290981a125f596a910189665c3453884dfc 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_bookmarks.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_bookmarks.php
@@ -30,7 +30,7 @@ if ((!empty($bookcat)) && $bookcat) $q.=" and (bookmark_category='$bookcat' or b
 
 else $q.="order by node_name";
 $result=$db->query($q);
-if (!$bookcat) {
+if (empty($bookcat) || !$bookcat) {
        while ($result->next()) {
                if (!$result->getString('bookmark_category')) {
                        $categories['unsorted']['children'][]=$result->getRecord();

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php b/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php
index 35c1aa37a56ca7f55d43bdbdb4a9125a894eed0c..3bb895eea5b73e387913d60dc6c2347216e415b7 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php
@@ -3,6 +3,8 @@
 function smarty_function_get_nodes_by_parent($params,&$smarty) {
        global $node;
 
+       $sql_time="";
+       $sql_type="";
        $parent=$params['parent'];
        $permissions=permissions::checkPerms($parent);
        if (!$permissions['r']) {
@@ -26,6 +28,7 @@ function smarty_function_get_nodes_by_parent($params,&$smarty) {
        if (isset($params['time'])) {
                $sql_time=" nodes.node_created > '".db_escape_string($params['time'])."' and ";
        }
+
        $q="select parent.node_name as parent_name,users.*,nodes.*,node_access.node_user_subchild_count from nodes left join nodes as parent on parent.node_id=nodes.node_parent left join node_access on node_access.node_id=nodes.node_id and node_access.user_id='$user_id' left  join users on users.user_id=nodes.node_creator where ";
        $q.=" $sql_time nodes.node_parent='$parent' and nodes.node_system_access!='private'";