<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6084] sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/navigation.php: Handbook plugin: Fix post navigation when using widget.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6084">6084</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6084","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-07 22:33:38 +0000 (Tue, 07 Nov 2017)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Handbook plugin: Fix post navigation when using widget.

* Use parent page as first child's 'previous' adjacent page.
* Use page's first child as its 'next' adjacent page.
* For last leaf node, recursively check ancestors for their 'next' sibling.
* Fix to properly order by menu_order then by post_title, when ordering by menu_order.
* Fix navigation for pages with lots of siblings.
* Enable navigation to work to/from/on private pages.

See <a href="http://meta.trac.wordpress.org/ticket/2871">#2871</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookincnavigationphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/navigation.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginshandbookincnavigationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/navigation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/navigation.php      2017-11-07 18:27:38 UTC (rev 6083)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/navigation.php        2017-11-07 22:33:38 UTC (rev 6084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,11 +48,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *                          widget is not in use. Default 'Table of Contents'.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public static function show_nav_links( $menu_name = 'Table of Contents' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $prev = $next = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( self::$using_pages_widget ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        self::navigate_via_handbook_pages_widget();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $adjacent = self::get_adjacent_posts_via_handbook_pages_widget();
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        self::navigate_via_menu( $menu_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $adjacent = self::get_adjacent_posts_via_menu( $menu_name );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               if ( is_array( $adjacent ) ) {
+                       list( $prev, $next ) = $adjacent;
+               }
+
+               self::output_navigation( $prev, $next );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,18 +68,45 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * handbook widget settings.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @access protected
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         *
+        * @param int|WP_Post $post        Optional. The post object or ID. Default is
+        *                                 global post.
+        * @param string      $type        Optional. The type of adjacent post(s) to
+        *                                 return. One of 'prev', 'next', or 'both'.
+        *                                 Default 'both'.
+        * @param int|WP_Post $source_post Optional. The post requesting an adjacent
+        *                                 post, if not $post itself. Default ''.
+        * @return null|array {
+        *    The previous and next post.
+        *
+        *    @type false|object $prev Object containing 'title' and 'url' for previous post.
+        *    @type false|object $prev Object containing 'title' and 'url' for next post.
+        * }
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        protected static function navigate_via_handbook_pages_widget() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function get_adjacent_posts_via_handbook_pages_widget( $post = '', $type = 'both', $source_post = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Get current post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $post = get_post() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $post = get_post( $post ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Bail unless a handbook page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! in_array( get_post_type(), WPorg_Handbook_Init::get_post_types() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! wporg_is_handbook_post_type( get_post_type( $post ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Determine which adjacent post(s) to find.
+               if ( in_array( $type, array( 'prev', 'next' ) ) ) {
+                       if ( 'prev' === $type ) {
+                               $get_prev = true;
+                               $get_next = false;
+                       } else {
+                               $get_prev = false;
+                               $get_next = true;
+                       }
+               } else {
+                       $get_prev = $get_next = true;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Get settings for widget.
</span><span class="cx" style="display: block; padding: 0 10px">                $sort_column = 'menu_order';
</span><span class="cx" style="display: block; padding: 0 10px">                $exclude     = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,25 +120,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Cache key format is pages:{post type}:{sort column}(:{excluded})?.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $cache_key = 'pages:' . get_post_type() . ':' . $sort_column;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $cache_key = 'pages:' . get_post_type( $post ) . ':' . $sort_column;
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $exclude ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $cache_key .= ':' . str_replace( ' ', '', $exclude );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">                $cache_group = 'wporg_handbook:' . get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $post_status = array( 'publish' );
+               if ( current_user_can( get_post_type_object( get_post_type( $post ) )->cap->read_private_posts ) ) {
+                       $post_status[] = 'private';
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Get the hierarchically and menu_order ordered list of handbook pages.
</span><span class="cx" style="display: block; padding: 0 10px">                $handbook_pages = wp_cache_get( $cache_key, $cache_group );
</span><span class="cx" style="display: block; padding: 0 10px">                if ( false === $handbook_pages ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'menu_order' === $sort_column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $sort_column = 'menu_order, post_title';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $sort_column = array( 'menu_order' => 'ASC', 'post_title' => 'ASC' );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $handbook_pages = get_pages( array(
-                               'echo'        => 0,
-                               'exclude'     => $exclude,
-                               'post_type'   => get_post_type(),
-                               'sort_column' => $sort_column,
-                               'sort_order'  => 'asc',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $parent_id = wp_get_post_parent_id( $post );
+
+                       $handbook_pages = get_posts( array(
+                               'exclude'        => $exclude,
+                               'post_parent'    => $parent_id,
+                               'post_status'    => $post_status,
+                               'post_type'      => get_post_type( $post ),
+                               'orderby'        => $sort_column,
+                               'order'          => 'ASC',
+                               'posts_per_page' => -1,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $handbook_pages ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,36 +155,78 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $prev = $next = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Determine the previous and next handbook pages.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $handbook_pages ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $current_page  = wp_list_filter( $handbook_pages, array( 'ID' => get_the_ID() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $current_page  = wp_list_filter( $handbook_pages, array( 'ID' => $post->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $current_index = array_keys( $current_page );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $current_index ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( false !== $current_index ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $current_index = $current_index[0];
</span><span class="cx" style="display: block; padding: 0 10px">                                $current_page  = $current_page[ $current_index ];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $prev = $next = false;
-
-                               if ( array_key_exists( $current_index - 1, $handbook_pages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // The previous post is the post's immediate sibling.
+                               // It's debatable if it should be the last leaf node of the previous
+                               // sibling's last child (since if you are on that leaf node, the next
+                               // post is the current post). That's what the custom menu-based
+                               // navigation does, but it is easier to do there than here.
+                               if ( $get_prev && array_key_exists( $current_index - 1, $handbook_pages ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $prev = $handbook_pages[ $current_index - 1 ];
</span><span class="cx" style="display: block; padding: 0 10px">                                        $prev = (object) array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'url'   => get_the_permalink( $prev->ID ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'title' => get_the_title( $prev->ID )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'title' => get_the_title( $prev->ID ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                         );
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( array_key_exists( $current_index + 1, $handbook_pages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If no previous yet, then it's the parent, if there is one.
+                               if ( $get_prev && ! $prev && $parent_id ) {
+                                       $prev = (object) array(
+                                               'url'   => get_the_permalink( $parent_id ),
+                                               'title' => get_the_title( $parent_id ),
+                                       );
+                               }
+
+                               // The next post may be this post's first child.
+                               if ( $get_next && ! $source_post ) {
+                                       $children = get_posts( array(
+                                               'exclude'        => $exclude,
+                                               'post_parent'    => $post->ID,
+                                               'post_status'    => $post_status,
+                                               'post_type'      => get_post_type( $post ),
+                                               'orderby'        => $sort_column,
+                                               'order'          => 'ASC',
+                                               'posts_per_page' => 1,
+                                       ) );
+                                       if ( $children ) {
+                                               $next = (object) array(
+                                                       'url'   => get_the_permalink( $children[0]->ID ),
+                                                       'title' => get_the_title( $children[0]->ID ),
+                                               );
+                                       }
+                               }
+
+                               // If no next yet, get next sibling.
+                               if ( $get_next && ! $next && array_key_exists( $current_index + 1, $handbook_pages ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $next = $handbook_pages[ $current_index + 1 ];
</span><span class="cx" style="display: block; padding: 0 10px">                                        $next = (object) array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'url'   => get_the_permalink( $next->ID ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'title' => get_the_title( $next->ID )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'title' => get_the_title( $next->ID ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                         );
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                self::output_navigation( $prev, $next );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // If no next yet, recursively check for a next ancestor.
+                               if ( $get_next && ! $next && $parent_id ) {
+                                       $parent_next = self::get_adjacent_posts_via_handbook_pages_widget( $parent_id, 'next', $post->ID );
+                                       if ( is_array( $parent_next ) ) {
+                                               $next = $parent_next[1];
+                                       }
+                               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               return array( $prev, $next );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,10 +236,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @access protected
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $menu_name The name of the menu to use for nav ordering.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @param int|WP_Post $post Optional. The post object or ID. Default is global
+        *                          post.
+        * @return null|array {
+        *    The previous and next post.
+        *
+        *    @type false|object $prev Object containing 'title' and 'url' for previous post.
+        *    @type false|object $prev Object containing 'title' and 'url' for next post.
+        * }
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        protected static function navigate_via_menu( $menu_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function get_adjacent_posts_via_menu( $menu_name, $post = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Get current post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $post = get_post() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $post = get_post( $post ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find the previous post (note: preview menu item may not be a post).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Find the previous post (note: previous menu item may not be a post).
</ins><span class="cx" style="display: block; padding: 0 10px">                 $previous = null;
</span><span class="cx" style="display: block; padding: 0 10px">                for ( $n = $i-1; $n >= 0; $n-- ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $menu_items[ $n ] ) && is_a( $menu_items[ $n ], 'WP_Post' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                self::output_navigation( $previous, $next );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return array( $previous, $next );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,4 +333,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> WPorg_Handbook_Navigation::init();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del></span></pre>
</div>
</div>

</body>
</html>