Changeset 1607 for devel/mod/pages

Show
Ignore:
Timestamp:
06/17/08 08:56:58 (6 months ago)
Author:
misja
Message:

Assorted patches, thanks rho

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/mod/pages/lib.php

    r1539 r1607  
    320320    } 
    321321 
    322     $elements = get_records_sql("SELECT ident,parent,name,uri,weight,owner FROM {$CFG->prefix}pages WHERE owner=? AND parent>=0 ORDER BY parent,weight,name", array($owner)); 
     322    $elements = get_records_sql("SELECT ident,parent,name,uri,weight,owner,access FROM {$CFG->prefix}pages WHERE owner=? AND parent>=0 ORDER BY parent,weight,name", array($owner)); 
    323323 
    324324    $menu = array(); 
    325325    if (is_array($elements)) { 
    326326        foreach ($elements as $e) { 
     327 
     328            // check access 
     329            if (!pages_permissions_check('pages::access', $e->ident)) { 
     330               continue; 
     331            } 
     332 
    327333            //FIXME: fix parent 
    328334            if ($e->ident == $e->parent) { 

  • devel/mod/pages/lib/pages.inc.php

    r1588 r1607  
    639639    } else { 
    640640        $obj = get_config('pages_default'); 
    641         $default = $obj->value; 
     641        $default = isset($obj->value) ? $obj->value : ('Main'); 
    642642    } 
    643643    return $page_id == $default;