<!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>[4745] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli: make/cli: Redirect the CLI handbook edit links to GitHub.</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/4745">4745</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/4745","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-20 04:16:22 +0000 (Fri, 20 Jan 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'>make/cli: Redirect the CLI handbook edit links to GitHub.
The CLI HAndbook is being maintained on GitHub, so it's confusing to be showing edit links that go to wp-admin. Instead, let's sent editors to the GitHub source.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgcliincclassmarkdownimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-markdown-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgcliwporgcliphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/wporg-cli.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgcliincclasshandbookphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-handbook.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgcliincclasshandbookphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-handbook.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/wporg-cli/inc/class-handbook.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-handbook.php 2017-01-20 04:16:22 UTC (rev 4745)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,87 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WPOrg_Cli;
+
+class Handbook {
+ /**
+ * WP-CLI Handbook pages are maintained in the GitHub repo, so the edit
+ * link should ridirect to there.
+ */
+ public static function redirect_edit_link_to_github( $link, $post_id, $context ) {
+ $post = get_post( $post_id );
+ if ( ! $post ) {
+ return $link;
+ }
+
+ if ( 'handbook' !== $post->post_type ) {
+ return $link;
+ }
+
+ $markdown_source = Markdown_Import::get_markdown_source( $post_id );
+ if ( is_wp_error( $markdown_source ) ) {
+ return $link;
+ }
+
+ if ( 'display' === $context ) {
+ $markdown_source = urlencode( $markdown_source );
+ }
+
+ return $markdown_source;
+ }
+
+ /**
+ * o2 does inline editing, so we also need to remove the class name that it looks for.
+ *
+ * o2 obeys the edit_post capability for displaying the edit link, so we also need to manually
+ * add the edit link if it isn't there - it always redirects to GitHub, so it doesn't need to
+ * obey the edit_post capability in this instance.
+ */
+ public static function redirect_o2_edit_link_to_github( $actions, $post_id ) {
+ $post = get_post( $post_id );
+ if ( ! $post ) {
+ return $actions;
+ }
+
+ if ( 'handbook' !== $post->post_type ) {
+ return $actions;
+ }
+
+ $markdown_source = Markdown_Import::get_markdown_source( $post_id );
+ if ( is_wp_error( $markdown_source ) ) {
+ return $actions;
+ }
+
+ /*
+ * Define our own edit post action for o2.
+ *
+ * Notable differences from the original are:
+ * - the 'href' parameter always goes to the GitHub source.
+ * - the 'o2-edit' class is missing, so inline editing is disabled.
+ */
+ $edit_action = array(
+ 'action' => 'edit',
+ 'href' => $markdown_source,
+ 'classes' => array( 'edit-post-link' ),
+ 'rel' => $post_ID,
+ 'initialState' => 'default'
+ );
+
+ // Find and replace the existing edit action.
+ $replaced = false;
+ foreach( $actions as &$action ) {
+ if ( 'edit' === $action['action'] ) {
+ $action = $edit_action;
+ $replaced = true;
+ break;
+ }
+ }
+ unset( $action );
+
+ // If there was no edit action replaced, add it in manually.
+ if ( ! $replaced ) {
+ $actions[30] = $edit_action;
+ }
+
+ return $actions;
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-handbook.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgcliincclassmarkdownimportphp"></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/wporg-cli/inc/class-markdown-import.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/wporg-cli/inc/class-markdown-import.php 2017-01-20 01:51:40 UTC (rev 4744)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/inc/class-markdown-import.php 2017-01-20 04:16:22 UTC (rev 4745)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,9 +85,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Update a post from its Markdown source
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private static function update_post_from_markdown_source( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $markdown_source = get_post_meta( $post_id, self::$meta_key, true );
- if ( ! $markdown_source ) {
- return new WP_Error( 'missing-markdown-source', 'Markdown source is missing for post.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $markdown_source = self::get_markdown_source( $post_id );
+ if ( is_wp_error( $markdown_source ) ) {
+ return $markdown_source;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'jetpack_require_lib' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'missing-jetpack-require-lib', 'jetpack_require_lib() is missing on system.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,4 +119,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">+ /**
+ * Retrieve the markdown source URL for a given post.
+ */
+ public static function get_markdown_source( $post_id ) {
+ $markdown_source = get_post_meta( $post_id, self::$meta_key, true );
+ if ( ! $markdown_source ) {
+ return new WP_Error( 'missing-markdown-source', 'Markdown source is missing for post.' );
+ }
+
+ return $markdown_source;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgcliwporgcliphp"></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/wporg-cli/wporg-cli.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/wporg-cli/wporg-cli.php 2017-01-20 01:51:40 UTC (rev 4744)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-cli/wporg-cli.php 2017-01-20 04:16:22 UTC (rev 4745)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,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"> require_once dirname( __FILE__ ) . '/inc/class-markdown-import.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once dirname( __FILE__ ) . '/inc/class-handbook.php';
</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"> * Registry of actions and filters
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +18,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'edit_form_after_title', array( 'WPOrg_Cli\Markdown_Import', 'action_edit_form_after_title' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( 'WPOrg_Cli\Markdown_Import', 'action_save_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'get_edit_post_link', array( 'WPOrg_Cli\Handbook', 'redirect_edit_link_to_github' ), 10, 2 );
+add_filter( 'o2_filter_post_actions', array( 'WPOrg_Cli\Handbook', 'redirect_o2_edit_link_to_github' ), 11, 2 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', function(){
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style>
</span></span></pre>
</div>
</div>
</body>
</html>