Changeset 6402

Show
Ignore:
Timestamp:
07/07/08 16:15:41 (20 months ago)
Author:
inureyes
Message:

#1045

  • [6401] 을 1.7 트리에 반영
Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/1.7/lib/model/blog.entry.php

    r6298 r6402  
    352352    requireModel('blog.category'); 
    353353    $entries = array(); 
    354     $paging = initPaging($folderURL, '/'); 
     354    $paging = $isNotice ? initPaging("$blogURL/notice", '/') : initPaging("$blogURL/entry", '/'); 
    355355    $visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 0'; 
    356356    $visibility .= ($isNotice || doesHaveOwnership())  ? '' : ' AND (c.visibility > 1 OR e.category = 0)'; 
    … …  
    422422    requireModel('blog.category'); 
    423423    $entries = array(); 
    424     $paging = initPaging("$blogURL/entry", '/'); 
     424    $paging = $isNotice ? initPaging("$blogURL/notice", '/') : initPaging("$blogURL/entry", '/'); 
    425425    $visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 0'; 
    426426    $visibility .= ($isNotice || doesHaveOwnership()) ? '' : getPrivateCategoryExclusionQuery($blogid);