<!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>[12062] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php: Profiles: Add activity when added as a presenter for Learn tutorial.</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 { white-space: pre-line; 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/12062">12062</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/12062","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>renyot</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-14 16:56:00 +0000 (Wed, 14 Sep 2022)</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'>Profiles: Add activity when added as a presenter for Learn tutorial.

See https://github.com/WordPress/five-for-the-future/issues/179</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgprofileswpactivitynotifierwporgprofileswpactivitynotifierphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgprofileswpactivitynotifierwporgprofileswpactivitynotifierphp"></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-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.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-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php      2022-09-08 21:23:06 UTC (rev 12061)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php        2022-09-14 16:56:00 UTC (rev 12062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> class WPOrg_WP_Activity_Notifier {
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @var WPOrg_WP_Activity_Notifier The singleton instance.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * The singleton instance.
+        *
+        * @var WPOrg_WP_Activity_Notifier
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        private static $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,6 +155,27 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                /**
+                * Gutenberg sends two requests when we hit the Publish/Update button.
+                * https://github.com/WordPress/wordpress.org/pull/84#discussion_r919290748
+                *
+                * For the first request, $old_status would be different from $new_status,
+                * if the post, for example, is changed from draft to published.
+                * For the second request (from the same Publish/Update button hit),
+                * $old_status would be the same as $new_status in the same example,
+                * both their values would be 'publish'.
+                *
+                * This brings the result that only the first request from Gutenberg could
+                * pass the condition if ($old_status == $new_status) { return; }.
+                *
+                * However, only the second request would carry the data from meta boxes,
+                * which is what we need here, so we need to put this logic above that
+                * condition.
+                */
+               if ( 'wporg_workshop' === $post->post_type ) {
+                       $this->notify_workshop_presenter( $post );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $old_status == $new_status ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +187,56 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->notify_blog_post( $post, 'new' );
</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">+        /**
+        * Sends activity notification for workshop presenter.
+        *
+        * @param WP_Post $post Post object.
+        */
+       private function notify_workshop_presenter( $post ) {
+               if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
+                       return;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $presenter_wporg_username = filter_input( INPUT_POST, 'presenter-wporg-username' );
+
+               if ( empty( $presenter_wporg_username ) ) {
+                       return;
+               }
+
+               $unique_presenter_wporg_username = array_unique( array_map( 'trim', explode( ',', $presenter_wporg_username ) ) );
+               $permalink                       = get_permalink( $post );
+               $title                           = wp_kses_data( $post->post_title );
+               $content                         = wp_trim_words(
+                       strip_shortcodes( has_excerpt( $post ) ? $post->post_excerpt : $post->post_content ),
+                       55
+               );
+
+               foreach ( $unique_presenter_wporg_username as $username ) {
+                       $user_id = get_user_by( 'slug', strtolower( $username ) )->ID;
+
+                       if ( ! $user_id ) {
+                               continue;
+                       }
+
+                       $args = array(
+                               'action'       => 'wporg_handle_activity',
+                               'component'    => 'learn',
+                               'type'         => 'workshop_presenter_assign',
+                               'user_id'      => $user_id,
+                               'primary_link' => $permalink,
+                               'item_id'      => $post->ID,
+                               'content'      => $content,
+                               'message'      => sprintf(
+                                       'Assigned as a presenter on the Learn WordPress tutorial, <i><a href="%s">%s</a></i>',
+                                       $permalink,
+                                       $title,
+                               ),
+                       );
+
+                       Profiles\api( $args );
+               }
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Sends activity notification for new blog post.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $activity The activity type. One of: create-topic, remove-topic.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int    $topic_id Topic ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private function _notify_forum_topic_payload( $activity, $topic_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function notify_forum_topic_payload( $activity, $topic_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +374,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">-                if ( ! in_array( $activity, array( 'create-topic', 'remove-topic' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! in_array( $activity, array( 'create-topic', 'remove-topic' ), true ) ) {
</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">@@ -315,18 +387,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $url = remove_query_arg( array( 'view' ), $url );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'action'    => 'wporg_handle_activity',
-                       'activity'  => $activity,
-                       'source'    => 'forum',
-                       'user'      => get_user_by( 'id', bbp_get_topic_author_id( $topic_id ) )->user_login,
-                       'post_id'   => '',
-                       'topic_id'  => $topic_id,
-                       'forum_id'  => bbp_get_topic_forum_id( $topic_id ),
-                       'title'     => strip_tags( bbp_get_topic_title( $topic_id ) ),
-                       'url'       => $url,
-                       'message'   => bbp_get_topic_excerpt( $topic_id, 55 ),
-                       'site'      => get_bloginfo( 'name' ),
-                       'site_url'  => site_url(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'action'   => 'wporg_handle_activity',
+                       'activity' => $activity,
+                       'source'   => 'forum',
+                       'user'     => get_user_by( 'id', bbp_get_topic_author_id( $topic_id ) )->user_login,
+                       'post_id'  => '',
+                       'topic_id' => $topic_id,
+                       'forum_id' => bbp_get_topic_forum_id( $topic_id ),
+                       'title'    => strip_tags( bbp_get_topic_title( $topic_id ) ),
+                       'url'      => $url,
+                       'message'  => bbp_get_topic_excerpt( $topic_id, 55 ),
+                       'site'     => get_bloginfo( 'name' ),
+                       'site_url' => site_url(),
</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">                Profiles\api( $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int $topic_id Topic ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function notify_forum_new_topic( $topic_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->_notify_forum_topic_payload( 'create-topic', $topic_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->notify_forum_topic_payload( 'create-topic', $topic_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +419,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int $topic_id Topic ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function notify_forum_remove_topic( $topic_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->_notify_forum_topic_payload( 'remove-topic', $topic_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->notify_forum_topic_payload( 'remove-topic', $topic_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $activity The activity type. One of: create-reply, remove-reply.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int    $reply_id Reply ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private function _notify_forum_reply_payload( $activity, $reply_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function notify_forum_reply_payload( $activity, $reply_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +439,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">-                if ( ! in_array( $activity, array( 'create-reply', 'remove-reply' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! in_array( $activity, array( 'create-reply', 'remove-reply' ), true ) ) {
</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">@@ -380,18 +452,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $url = remove_query_arg( array( 'view' ), $url );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'action'    => 'wporg_handle_activity',
-                       'activity'  => $activity,
-                       'source'    => 'forum',
-                       'user'      => get_user_by( 'id', bbp_get_reply_author_id( $reply_id ) )->user_login,
-                       'post_id'   => $reply_id,
-                       'topic_id'  => bbp_get_reply_topic_id( $reply_id ),
-                       'forum_id'  => bbp_get_reply_forum_id( $reply_id ),
-                       'title'     => strip_tags( bbp_get_reply_topic_title( $reply_id ) ),
-                       'url'       => $url,
-                       'message'   => $this->get_reply_excerpt( $reply_id, 15 ),
-                       'site'      => get_bloginfo( 'name' ),
-                       'site_url'  => site_url(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'action'   => 'wporg_handle_activity',
+                       'activity' => $activity,
+                       'source'   => 'forum',
+                       'user'     => get_user_by( 'id', bbp_get_reply_author_id( $reply_id ) )->user_login,
+                       'post_id'  => $reply_id,
+                       'topic_id' => bbp_get_reply_topic_id( $reply_id ),
+                       'forum_id' => bbp_get_reply_forum_id( $reply_id ),
+                       'title'    => strip_tags( bbp_get_reply_topic_title( $reply_id ) ),
+                       'url'      => $url,
+                       'message'  => $this->get_reply_excerpt( $reply_id, 15 ),
+                       'site'     => get_bloginfo( 'name' ),
+                       'site_url' => site_url(),
</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">                Profiles\api( $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +475,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int $reply_id Reply ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function notify_forum_new_reply( $reply_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->_notify_forum_reply_payload( 'create-reply', $reply_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->notify_forum_reply_payload( 'create-reply', $reply_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,7 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int $reply_id Reply ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function notify_forum_remove_reply( $reply_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->_notify_forum_reply_payload( 'remove-reply', $reply_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->notify_forum_reply_payload( 'remove-reply', $reply_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function trim_text( $text, $length = 15, $trim_style = 'words' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $length     = (int) $length;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $trim_style = in_array( $trim_style, array( 'chars', 'words' ) ) ? $trim_style : 'words';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $trim_style = in_array( $trim_style, array( 'chars', 'words' ), true ) ? $trim_style : 'words';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Remove blockquoted text since the text isn't original.
</span><span class="cx" style="display: block; padding: 0 10px">                $text = preg_replace( '/<blockquote>.+?<\/blockquote>/s', '', $text );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,8 +550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                                $text .= '&hellip;';
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } else {
-                       // Else trim by words.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } else { // Else trim by words.
</ins><span class="cx" style="display: block; padding: 0 10px">                         $text = wp_trim_words( $text, $length );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>