<!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>[14426] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/admin.php: Photo Directory, Admin: Reimplement appending author column submission stats as a custom 'Author' column.</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/14426">14426</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/14426","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>2025-04-16 20:50:08 +0000 (Wed, 16 Apr 2025)</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'>Photo Directory, Admin: Reimplement appending author column submission stats as a custom 'Author' column.

- Replaces existing 'Author' column.
- Renames `add_published_photos_count_to_author` to `get_author_submission_stats()`.

Props mujuonly, nilovelez, otto42, coffee2code.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincadminphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/admin.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincadminphp"></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/photo-directory/inc/admin.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/photo-directory/inc/admin.php    2025-04-15 18:01:21 UTC (rev 14425)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/admin.php      2025-04-16 20:50:08 UTC (rev 14426)
</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"> class Admin {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        const COL_NAME_AUTHOR = 'wporg-photo-author';
</ins><span class="cx" style="display: block; padding: 0 10px">         const COL_NAME_FLAG  = 'wporg-flags';
</span><span class="cx" style="display: block; padding: 0 10px">        const COL_NAME_PHOTO = 'wporg-photo';
</span><span class="cx" style="display: block; padding: 0 10px">        const COL_NAME_CONTRIBUTOR_IP = 'wporg-contributor-ip';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +27,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( "add_meta_boxes_{$post_type}",             [ __CLASS__, 'remove_metaboxes' ], 15 );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'load-edit.php',                           [ __CLASS__, 'add_admin_css' ] );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'load-post.php',                           [ __CLASS__, 'add_admin_css' ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                add_filter( "manage_{$post_type}_posts_columns",       [ __CLASS__, 'add_author_column' ] );
+               add_action( "manage_{$post_type}_posts_custom_column", [ __CLASS__, 'handle_author_column_data' ], 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( "manage_{$post_type}_posts_columns",       [ __CLASS__, 'add_photo_column' ] );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( "manage_{$post_type}_posts_custom_column", [ __CLASS__, 'handle_photo_column_data' ], 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "manage_{$post_type}_posts_columns",       [ __CLASS__, 'add_flags_column' ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +35,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( "manage_{$post_type}_posts_custom_column", [ __CLASS__, 'handle_flags_column_data' ], 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( "manage_edit-{$post_type}_columns",        [ __CLASS__, 'remove_columns_from_pending_photos' ] );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'post_row_actions',                        [ __CLASS__, 'add_post_action_photo_links' ], 10, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'the_author',                              [ __CLASS__, 'add_published_photos_count_to_author' ] );
</del><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'use_block_editor_for_post_type',          [ __CLASS__, 'disable_block_editor' ], 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_notices',                           [ __CLASS__, 'add_notice_to_photo_media_if_pending' ] );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'add_menu_classes',                        [ __CLASS__, 'add_admin_menu_pending_indicator' ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,6 +329,89 @@
</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">+         * Replaces default 'Author' column with a custom 'Author' column that shows
+        * typical author column data as well as additional data.
+        *
+        * As of WP 6.8, it no longer easy to modify the existing 'Author' column to
+        * add more data, so this adds a custom column to replace the 'Author' column.
+        *
+        * @param  array $posts_columns Array of post column titles.
+        * @return array The $posts_columns array with the photo author column added.
+        */
+       public static function add_author_column( $posts_columns ) {
+               if ( ! self::should_include_photo_column() ) {
+                       return $posts_columns;
+               }
+
+               // Position after existing 'Author' column.
+               $pos = array_search( 'author', array_keys( $posts_columns ) );
+
+               if ( ! $pos ) {
+                       // Else, position the column after the 'Title' column (where 'Author' is normally located).
+                       $pos = array_search( 'title', array_keys( $posts_columns ) );
+               }
+
+               if ( $pos ) {
+                       $pos++;
+                       $posts_columns = array_slice( $posts_columns, 0, $pos, true )
+                               + [ self::COL_NAME_AUTHOR => __( 'Author', 'wporg-photos' ) ]
+                               + array_slice( $posts_columns, $pos, count( $posts_columns ) - 1, true );
+               } else {
+                       $posts_columns[ self::COL_NAME_AUTHOR ] = __( 'Author', 'wporg-photos' );
+               }
+
+               // Remove the existing 'Author' column.
+               unset( $posts_columns['author'] );
+
+               return $posts_columns;
+       }
+
+       /**
+        * Outputs the photo author column content for the post.
+        *
+        * @param string $column_name The name of the column.
+        * @param int    $post_id     The id of the post being displayed.
+        */
+       public static function handle_author_column_data( $column_name, $post_id ) {
+               if ( self::COL_NAME_AUTHOR !== $column_name ) {
+                       return;
+               }
+
+               $post = get_post( $post_id );
+
+               // Get the same 'Author' column content as generated by core.
+               $list_table = _get_list_table( 'WP_Posts_List_Table' );
+               $core_html = $list_table->column_author( $post );
+
+               /**
+                * Fires before any photo author column content is output.
+                *
+                * @param WP_Post The post object.
+                */
+               do_action( 'photo_author_column_data_start', $post );
+
+               // Output core's default author column data for this post.
+               echo $core_html;
+
+               /**
+                * Fires after the default author column content is output.
+                *
+                * @param WP_Post The post object.
+                */
+               do_action( 'photo_author_column_data_after_author', $post );
+
+               // Output author submission counts.
+               echo self::get_author_submission_stats( (int) get_post_field( 'post_author', $post_id ) );
+
+               /**
+                * Fires at the end of the photo author column content.
+                *
+                * @param WP_Post The post object.
+                */
+               do_action( 'photo_author_column_data_end', $post );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Adds a column to show the featured photo.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param  array $posts_columns Array of post column titles.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,32 +892,24 @@
</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">-         * Appends the count of the published photos to author names in photo post
-        * listings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Returns hyperlinked statistics on the author's submission counts (published,
+        * pending, rejected, etc) intended to be shown to moderators.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param string $display_name The author's display name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param int $author_id Author ID.
</ins><span class="cx" style="display: block; padding: 0 10px">          * @return string
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public static function add_published_photos_count_to_author( $display_name ) {
-               global $authordata;
-
-               if ( ! is_admin() || ! self::should_include_photo_column( true ) ) {
-                       return $display_name;
-               }
-
-               // Close link to contributor's listing of photos.
-               $display_name .= '</a>';
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_author_submission_stats( $author_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $post_type     = Registrations::get_post_type();
</span><span class="cx" style="display: block; padding: 0 10px">                $reject_status = Rejection::get_post_status();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $stats_display = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Show number of approved photos.
</span><span class="cx" style="display: block; padding: 0 10px">                $approved_link = add_query_arg( [
</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'   => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px">                        'post_status' => 'publish',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'author'      => $authordata->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'author'      => $author_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                 ], 'edit.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $display_name .= '<div class="user-approved-count">'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $stats_display .= '<div class="user-approved-count">'
</ins><span class="cx" style="display: block; padding: 0 10px">                 . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                        __( 'Approved: <strong>%s</strong>', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        sprintf( '<a href="%s">%d</a>', $approved_link, User::count_published_photos() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,9 +922,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $approved_today_link = add_query_arg( [
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'   => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'publish',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'author'      => $authordata->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'author'      => $author_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ], 'edit.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $display_name .= '<div class="user-approved-today-count">'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $stats_display .= '<div class="user-approved-today-count">'
</ins><span class="cx" style="display: block; padding: 0 10px">                                 . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        __( '&#x21AA; (today): %s', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        sprintf( '<strong><a href="%s">%d</a></strong>', $approved_today_link, $approved_today_count )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -861,10 +938,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $pending_link = add_query_arg( [
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'   => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => 'pending',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'author'      => $authordata->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'author'      => $author_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ], 'edit.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $display_name .= '<div class="user-pending-count">'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $stats_display .= '<div class="user-pending-count">'
</ins><span class="cx" style="display: block; padding: 0 10px">                                 . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        __( 'Pending: <strong>%s</strong>', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        sprintf( '<a href="%s">%d</a>', $pending_link, $pending_count )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,14 +950,14 @@
</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">                // Show number of rejected photos.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $rejection_count = User::count_rejected_photos( $authordata->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $rejection_count = User::count_rejected_photos( $author_id );
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $rejection_count ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $rejected_link = add_query_arg( [
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'   => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => $reject_status,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'author'      => $authordata->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'author'      => $author_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ], 'edit.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $display_name .= '<div class="user-rejected-count">'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $stats_display .= '<div class="user-rejected-count">'
</ins><span class="cx" style="display: block; padding: 0 10px">                                 . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Count of user rejections linked to listing of their rejections. */
</span><span class="cx" style="display: block; padding: 0 10px">                                        _n( 'Rejected: <strong>%s</strong>', 'Rejected: <strong>%s</strong>', $rejection_count, 'wporg-photos' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,9 +972,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $rejected_today_link = add_query_arg( [
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_type'   => $post_type,
</span><span class="cx" style="display: block; padding: 0 10px">                                'post_status' => $reject_status,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'author'      => $authordata->ID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'author'      => $author_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ], 'edit.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $display_name .= '<div class="user-rejected-today-count">'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $stats_display .= '<div class="user-rejected-today-count">'
</ins><span class="cx" style="display: block; padding: 0 10px">                                 . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                        __( '&#x21AA; (today): %s', 'wporg-photos' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        sprintf( '<strong><a href="%s">%d</a></strong>', $rejected_today_link, $rejected_today_count )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,10 +982,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                . "</div>\n";
</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">-                // Prevent unbalanced tag.
-               $display_name .= '<a>';
-
-               return $display_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $stats_display;
</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">@@ -1315,13 +1389,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public static function add_contributor_ip_column( $posts_columns ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pos = array_search( 'author', array_keys( $posts_columns ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pos = array_search( self::COL_NAME_AUTHOR, array_keys( $posts_columns ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $pos ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $pos++;
</span><span class="cx" style="display: block; padding: 0 10px">                        $posts_columns = array_slice( $posts_columns, 0, $pos, true )
</span><span class="cx" style="display: block; padding: 0 10px">                                + [ self::COL_NAME_CONTRIBUTOR_IP => __( 'Contributor IP', 'wporg-photos' ) ]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                + array_slice( $posts_columns, 3, count( $posts_columns ) - 1, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         + array_slice( $posts_columns, $pos, count( $posts_columns ) - 1, true );
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $posts_columns[ self::COL_NAME_CONTRIBUTOR_IP ] = __( 'Contributor IP', 'wporg-photos' );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre>
</div>
</div>

</body>
</html>