20,21c20,31
<         $node->expire   = $row->expire;
<         $node->expired  = $row->expired;
---
>         if ($row->expire == 0) {
>           $node->expire   = '';
>         }
>         else {
>           $node->expire   = $row->expire;
>         }
>         if ($row->expired == 0) {
>           $node->expired   = '';
>         }
>         else {
>           $node->expired  = $row->expired;
>         }
26c36
<       if (!isset($node->expire)) {
---
>       if (!isset($node->expire)  && !empty($ntypes['default'])) {