X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b3ddbea8a296025a672b3c3ddca158dc51ed8080..refs/tags/wordpress-3.4.2-scripts:/wp-admin/includes/class-wp-ms-themes-list-table.php

diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index cd9841da..abbf6a02 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -15,14 +15,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	function __construct() {
 		global $status, $page;
 
-		$default_status = get_user_option( 'themes_last_view' );
-		if ( empty( $default_status ) )
-			$default_status = 'all';
-		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : $default_status;
-		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search' ) ) )
+		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
+		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
 			$status = 'all';
-		if ( $status != $default_status && 'search' != $status )
-			update_user_meta( get_current_user_id(), 'themes_last_view', $status );
 
 		$page = $this->get_pagenum();
 
@@ -55,56 +50,47 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	function prepare_items() {
-		global $status, $themes, $totals, $page, $orderby, $order, $s;
+		global $status, $totals, $page, $orderby, $order, $s;
 
 		wp_reset_vars( array( 'orderby', 'order', 's' ) );
 
 		$themes = array(
-			'all' => apply_filters( 'all_themes', get_themes() ),
+			'all' => apply_filters( 'all_themes', wp_get_themes() ),
 			'search' => array(),
 			'enabled' => array(),
 			'disabled' => array(),
-			'upgrade' => array()
+			'upgrade' => array(),
+			'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
 		);
 
-		$site_allowed_themes = get_site_allowed_themes();
-		if ( !$this->is_site_themes ) {
-			$allowed_themes = $site_allowed_themes;
-			$themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
-		} else {
-			$allowed_themes = wpmu_get_blog_allowedthemes( $this->site_id );
+		if ( $this->is_site_themes ) {
 			$themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
+			$allowed_where = 'site';
+		} else {
+			$themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
+			$allowed_where = 'network';
 		}
 
-		$current = get_site_transient( 'update_themes' );
+		$maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
 
 		foreach ( (array) $themes['all'] as $key => $theme ) {
-			$theme_key = $theme['Stylesheet'];
-
-			if ( isset( $allowed_themes [ $theme_key ] ) )  {
-				$themes['all'][$key]['enabled'] = true;
-				$themes['enabled'][$key] = $themes['all'][$key];
-			}
-			else {
-				$themes['all'][$key]['enabled'] = false;
-				$themes['disabled'][$key] = $themes['all'][$key];
+			if ( $this->is_site_themes && $theme->is_allowed( 'network' ) ) {
+				unset( $themes['all'][ $key ] );
+				continue;
 			}
-			if ( isset( $current->response[ $theme['Template'] ] ) )
-				$themes['upgrade'][$key] = $themes['all'][$key];
 
-			if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) {
-				unset( $themes['all'][$key] );
-				unset( $themes['enabled'][$key] );
-				unset( $themes['disabled'][$key] );
+			if ( $maybe_update && isset( $current->response[ $key ] ) ) {
+				$themes['all'][ $key ]->update = true;
+				$themes['upgrade'][ $key ] = $themes['all'][ $key ];
 			}
-		}
 
-		if ( !current_user_can( 'update_themes' ) || $this->is_site_themes )
-			$themes['upgrade'] = array();
+			$filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
+			$themes[ $filter ][ $key ] = $themes['all'][ $key ];
+		}
 
 		if ( $s ) {
 			$status = 'search';
-			$themes['search'] = array_filter( $themes['all'], array( &$this, '_search_callback' ) );
+			$themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( &$this, '_search_callback' ) );
 		}
 
 		$totals = array();
@@ -115,19 +101,27 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			$status = 'all';
 
 		$this->items = $themes[ $status ];
+		WP_Theme::sort_by_name( $this->items );
+
+		$this->has_items = ! empty( $themes['all'] );
 		$total_this_page = $totals[ $status ];
 
 		if ( $orderby ) {
 			$orderby = ucfirst( $orderby );
 			$order = strtoupper( $order );
 
-			uasort( $this->items, array( &$this, '_order_callback' ) );
+			if ( $orderby == 'Name' ) {
+				if ( 'ASC' == $order )
+					$this->items = array_reverse( $this->items );
+			} else {
+				uasort( $this->items, array( &$this, '_order_callback' ) );
+			}
 		}
 
 		$start = ( $page - 1 ) * $themes_per_page;
 
 		if ( $total_this_page > $themes_per_page )
-			$this->items = array_slice( $this->items, $start, $themes_per_page );
+			$this->items = array_slice( $this->items, $start, $themes_per_page, true );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -140,19 +134,27 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		if ( is_null( $term ) )
 			$term = stripslashes( $_REQUEST['s'] );
 
-		$search_fields = array( 'Name', 'Title', 'Description', 'Author', 'Author Name', 'Author URI', 'Template', 'Stylesheet' );
-		foreach ( $search_fields as $field )
-			if ( stripos( $theme[ $field ], $term ) !== false )
+		foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
+			// Don't mark up; Do translate.
+			if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
 				return true;
+		}
+
+		if ( false !== stripos( $theme->get_stylesheet(), $term ) )
+			return true;
+
+		if ( false !== stripos( $theme->get_template(), $term ) )
+			return true;
 
 		return false;
 	}
 
+	// Not used by any core columns.
 	function _order_callback( $theme_a, $theme_b ) {
 		global $orderby, $order;
 
-		$a = $theme_a[$orderby];
-		$b = $theme_b[$orderby];
+		$a = $theme_a[ $orderby ];
+		$b = $theme_b[ $orderby ];
 
 		if ( $a == $b )
 			return 0;
@@ -164,9 +166,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	function no_items() {
-		global $themes;
-
-		if ( !empty( $themes['all'] ) )
+		if ( ! $this->has_items )
 			_e( 'No themes found.' );
 		else
 			_e( 'You do not appear to have any themes available at this time.' );
@@ -209,6 +209,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 				case 'upgrade':
 					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
 					break;
+				case 'broken' :
+					$text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
+					break;
 			}
 
 			if ( $this->is_site_themes )
@@ -260,14 +263,17 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	function single_row( $key, $theme ) {
-		global $status, $page, $s;
+		global $status, $page, $s, $totals;
 
 		$context = $status;
 
-		if ( $this->is_site_themes )
+		if ( $this->is_site_themes ) {
 			$url = "site-themes.php?id={$this->site_id}&amp;";
-		else
+			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		} else {
 			$url = 'themes.php?';
+			$allowed = $theme->is_allowed( 'network' );
+		}
 
 		// preorder
 		$actions = array(
@@ -277,30 +283,32 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			'delete' => ''
 		);
 
-		$theme_key = $theme['Stylesheet'];
+		$theme_key = $theme->get_stylesheet();
 
-		if ( empty( $theme['enabled'] ) )
-			$actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $theme_key) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
-		else
+		if ( ! $allowed ) {
+			if ( ! $theme->errors() )
+				$actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $theme_key) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
+		} else {
 			$actions['disable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=disable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'disable-theme_' . $theme_key) ) . '" title="' . esc_attr__('Disable this theme') . '">' . ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) . '</a>';
+		}
 
 		if ( current_user_can('edit_themes') )
-			$actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . urlencode( $theme['Name'] )) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
+			$actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . urlencode( $theme_key ) ) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
 
-		if ( empty( $theme['enabled'] ) && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $theme_key != get_option( 'stylesheet' ) && $theme_key != get_option( 'template' ) )
+		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $theme_key != get_option( 'stylesheet' ) && $theme_key != get_option( 'template' ) )
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&amp;checked[]=' . $theme_key . '&amp;theme_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
 
 		$actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
 		$actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );
 
-		$class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
-		$checkbox_id = "checkbox_" . md5($theme['Name']);
-		$checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme['Name'] . "</label>";
+		$class = ! $allowed ? 'inactive' : 'active';
+		$checkbox_id = "checkbox_" . md5( $theme->get('Name') );
+		$checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme->display('Name') . "</label>";
 
-		$description = '<p>' . $theme['Description'] . '</p>';
-		$theme_name = $theme['Name'];
+		$id = sanitize_html_class( $theme->get_stylesheet() );
 
-		$id = sanitize_title( $theme_name );
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+			$class .= ' update';
 
 		echo "<tr id='$id' class='$class'>";
 
@@ -316,25 +324,28 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 					echo "<th scope='row' class='check-column'>$checkbox</th>";
 					break;
 				case 'name':
-					echo "<td class='theme-title'$style><strong>$theme_name</strong>";
+					echo "<td class='theme-title'$style><strong>" . $theme->display('Name') . "</strong>";
 					echo $this->row_actions( $actions, true );
 					echo "</td>";
 					break;
 				case 'description':
-					echo "<td class='column-description desc'$style>
-						<div class='theme-description'>$description</div>
+					echo "<td class='column-description desc'$style>";
+					if ( $theme->errors() ) {
+						$pre = $status == 'broken' ? '' : __( 'Broken Theme:' ) . ' ';
+						echo '<p><strong class="attention">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+					}
+					echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
 						<div class='$class second theme-version-author-uri'>";
 
 					$theme_meta = array();
 
-					if ( !empty( $theme['Version'] ) )
-						$theme_meta[] = sprintf( __( 'Version %s' ), $theme['Version'] );
+					if ( $theme->get('Version') )
+						$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
 
-					if ( !empty( $theme['Author'] ) )
-						$theme_meta[] = sprintf( __( 'By %s' ), $theme['Author'] );
+					$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
 
-					if ( !empty( $theme['Theme URI'] ) )
-						$theme_meta[] = '<a href="' . $theme['Theme URI'] . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
+					if ( $theme->get('ThemeURI') )
+						$theme_meta[] = '<a href="' . $theme->display('ThemeURI') . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
 
 					$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $theme_key, $theme, $status );
 					echo implode( ' | ', $theme_meta );
@@ -357,5 +368,3 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		do_action( "after_theme_row_$theme_key", $theme_key, $theme, $status );
 	}
 }
-
-?>