In WP_List_Table, make a new public method, ->get_primary_column(), and revert [34101] due to BC issues.

staylor · staylor · commit ab7ca361ddeb · 2015-09-14T20:28:29.000Z
Fixes #33854. git-svn-id: https://develop.svn.wordpress.org/trunk@34128 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
@@ -888,6 +888,10 @@ protected function get_default_primary_column_name() {
 		return $column;
 	}
 
+	public function get_primary_column() {
+		return $this->get_primary_column_name();
+	}
+
 	/**
 	 * Gets the name of the primary column.
 	 *
@@ -896,7 +900,7 @@ protected function get_default_primary_column_name() {
 	 *
 	 * @return string The name of the primary column.
 	 */
-	public function get_primary_column_name() {
+	protected function get_primary_column_name() {
 		$columns = $this->get_columns();
 		$default = $this->get_default_primary_column_name();
 
diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -252,7 +252,7 @@ protected function get_sortable_columns() {
 	 *
 	 * @return string Unalterable name of the primary column name, in this case, 'name'.
 	 */
-	public function get_primary_column_name() {
+	protected function get_primary_column_name() {
 		return 'name';
 	}
 
diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -724,7 +724,7 @@ public function single_row( $item ) {
 	 *
 	 * @return string Unalterable name for the primary column, in this case, 'name'.
 	 */
-	public function get_primary_column_name() {
+	protected function get_primary_column_name() {
 		return 'name';
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -888,6 +888,10 @@ protected function get_default_primary_column_name() {`
`888`	`888`	`return $column;`
`889`	`889`	`}`
`890`	`890`
	`891`	`+ public function get_primary_column() {`
	`892`	`+ return $this->get_primary_column_name();`
	`893`	`+ }`
	`894`	`+`
`891`	`895`	`/**`
`892`	`896`	`* Gets the name of the primary column.`
`893`	`897`	`*`
`@@ -896,7 +900,7 @@ protected function get_default_primary_column_name() {`
`896`	`900`	`*`
`897`	`901`	`* @return string The name of the primary column.`
`898`	`902`	`*/`
`899`		`- public function get_primary_column_name() {`
	`903`	`+ protected function get_primary_column_name() {`
`900`	`904`	`$columns = $this->get_columns();`
`901`	`905`	`$default = $this->get_default_primary_column_name();`
`902`	`906`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ protected function get_sortable_columns() {`
`252`	`252`	`*`
`253`	`253`	`* @return string Unalterable name of the primary column name, in this case, 'name'.`
`254`	`254`	`*/`
`255`		`- public function get_primary_column_name() {`
	`255`	`+ protected function get_primary_column_name() {`
`256`	`256`	`return 'name';`
`257`	`257`	`}`
`258`	`258`
Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ public function single_row( $item ) {`
`724`	`724`	`*`
`725`	`725`	`* @return string Unalterable name for the primary column, in this case, 'name'.`
`726`	`726`	`*/`
`727`		`- public function get_primary_column_name() {`
	`727`	`+ protected function get_primary_column_name() {`
`728`	`728`	`return 'name';`
`729`	`729`	`}`
`730`	`730`	`}`