Develop/Modification1/51へもどる

diff -w pagetree.inc.php_20 pagetree.inc.php_16paraedit

11,49d10
<
< // Move FrontPage to the top of the tree
< if (!defined('PLUGIN_PAGETREE_TOP_DEFAULTPAGE')) {
<     define('PLUGIN_PAGETREE_TOP_DEFAULTPAGE', true);
< }
<
< // Hide top-level leaf pages such as Help, MenuBar etc.
< if (!defined('PLUGIN_PAGETREE_HIDE_TOPLEVEL_LEAVES')) {
<     define('PLUGIN_PAGETREE_HIDE_TOPLEVEL_LEAVES', true);
< }
<
< // Ignore list
< if (!defined('PLUGIN_PAGETREE_NON_LIST')) {
<     define('PLUGIN_PAGETREE_NON_LIST', '');
< }
<
< // Include list
< if (!defined('PLUGIN_PAGETREE_INCLUDE_LIST')) {
<     define('PLUGIN_PAGETREE_INCLUDE_LIST', '');
< }
<
< // Markers
< if (!defined('PLUGIN_PAGETREE_MARKER_COLLAPSED')) {
<     define('PLUGIN_PAGETREE_MARKER_COLLAPSED',
< }
< if (!defined('PLUGIN_PAGETREE_MARKER_EXPANDED')) {
<     define('PLUGIN_PAGETREE_MARKER_EXPANDED',
< }
< if (!defined('PLUGIN_PAGETREE_MARKER_LEAF')) {
<     define('PLUGIN_PAGETREE_MARKER_LEAF',
< }
<
<
102c63
<         if ($parent === $ancestors[$parent_level]) {
---
>               if ($parent === (isset($ancestors[$parent_level]) ? $ancestors[$parent_level] : FALSE)) {
125a87
>       $pattern = '/' . PLUGIN_PAGETREE_NON_LIST . '/';
182c144,155
<     global $defaultpage, $script, $_pagetree_messages;
---
>       global $defaultpage, $_pagetree_messages, $vars;
>       $nooutput = FALSE;
>       $abbreviatedate = FALSE;
>
>       $currentisdate = preg_match('/(\d{4})-(\d{2})-(\d{2})$/', $current, $datematches);
>
>       $ptyear = isset($vars['ptyear']) ? $vars['ptyear'] :
>               ($currentisdate ? $datematches[1] : get_date('Y'));
>       $ptmonth = isset($vars['ptmonth']) ? $vars['ptmonth'] :
>               ($currentisdate ? $datematches[2] : get_date('m'));
>
>       $script = get_script_uri('abs');
207a181,182
>       $currentlevel = substr_count($current, '/') + 1;
>       $pagemax = count($pages) - 1;           //ioio
216a192
>               if($i !== $pagemax) {
217a194,217
>               } else {
>                       $next_level = 1;
>               }
>
>               if(defined('PLUGIN_PAGETREE_CALENDAR_BLOGMODE'))
>               {
>                       if($level >= $currentlevel)
>                       {
>                               $pageisdate = preg_match('/(\d{4})-(\d{2})-(\d{2})$/', $page, $datematches);
>                               //$datematches
>                               //[0] = YYYY-MM-DD
>                               //[1] = YYYY
>                               //[2] = MM
>                               //[3] = DD
>                               if($pageisdate) {
>                                       $pagemonth = $datematches[1] . '-' . $datematches[2];
>                                       $abbreviatedate = $pageisdate && ($pagemonth !== $ptyear . '-' . $ptmonth);
>                               } else {
>                                       $abbreviatedate = FALSE;
>                               }
>                       } else {
>                               $abbreviatedate = FALSE;
>                       }
>               }
226a227,252
>               } else if($abbreviatedate) {
>                       if($ptyear === $datematches[1]) {       // display month because the year is directed.
>                               if(!isset($datepage[$datematches[1]][$datematches[2]]))
>                               {
>                                       $datepage[$datematches[1]][$datematches[2]] = TRUE;
>                                       $link = get_pkwk_getparams();
>                                       $link['ptyear'] = $datematches[1];
>                                       $link['ptmonth'] = $datematches[2];
>                                       $html .= $indents . '<li class="collapsed">' . $marker_collapsed
>                                               . make_ahref(get_wiki_uri($link), $pagemonth . '...', array('rel'=>'nofollow'));
>                               } else {
>                                       $nooutput = TRUE;               // not output '</li>'
>                               }
>                       } else {        // display only year
>                               if(!isset($datepage[$datematches[1]]))
>                               {
>                                       $datepage[$datematches[1]] = TRUE;
>                                       $link = get_pkwk_getparams();
>                                       $link['ptyear'] = $datematches[1];
>                                       $link['ptmonth'] = $datematches[2];     // first month is displayed.
>                                       $html .= $indents . '<li class="collapsed">' . $marker_collapsed
>                                               . make_ahref(get_wiki_uri($link), $link['ptyear'] . '...', array('rel'=>'nofollow'));
>                               } else {
>                                       $nooutput = TRUE;               // not output '</li>'
>                               }
>                       }
233,234c259
<                       .  '<a href="' . $url . '" title="' . $title . '">'
<                       .  $marker_leaf . $s_label . '</a>';
---
>                                       .  make_pagelink($page, $marker_leaf . $s_label);
237,238c262
<                       .  '<a href="' . $url . '" title="' . $title . '">'
<                       .  $marker_expanded . $s_label . '</a>';
---
>                                       .  make_pagelink($page, $marker_expanded . $s_label);
241,242c265
<                       .  '<a href="' . $url . '" title="' . $title . '">'
<                       .  $marker_collapsed . $s_label . '</a>';
---
>                                       .  make_pagelink($page, $marker_collapsed . $s_label);
245a269
>               if(!$nooutput) {
252a277,278
>               }
>               $nooutput = FALSE;

トップ 編集凍結差分バックアップ添付複製名前変更リロード 新規一覧 単語検索 最終更新  ヘルプ  最終更新のRSS
Last-modified: 2010-09-13 (月) 00:21:55 (4153d)