<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15655] trunk/wp-admin/includes: get_theme_feature_list()
replaces install_themes_feature_list().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15655">15655</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-09-24 15:28:28 +0000 (Fri, 24 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>get_theme_feature_list() replaces install_themes_feature_list(). Does translation and works if feature_list is not accessible from api.wordpress.org. see <a href="http://trac.wordpress.org/ticket/14936">#14936</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (15654 => 15655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2010-09-24 14:08:07 UTC (rev 15654)
+++ trunk/wp-admin/includes/theme-install.php 2010-09-24 15:28:28 UTC (rev 15655)
</span><span class="lines">@@ -70,6 +70,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><ins>+ * @deprecated since 3.1.0 Use get_theme_feature_list() instead.
+ *
</ins><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function install_themes_feature_list( ) {
</span><span class="lines">@@ -124,30 +126,15 @@
</span><span class="cx"> <form method="post" action="<?php echo admin_url( 'theme-install.php?tab=search' ); ?>">
</span><span class="cx"> <p class="install-help"><?php _e('Find a theme based on specific features') ?></p>
</span><span class="cx"> <?php
</span><del>- $feature_list = install_themes_feature_list( );
</del><ins>+ $feature_list = get_theme_feature_list( );
</ins><span class="cx"> echo '<div class="feature-filter">';
</span><del>- $trans = array ('Colors' => __('Colors'), 'black' => __('Black'), 'blue' => __('Blue'), 'brown' => __('Brown'),
- 'green' => __('Green'), 'orange' => __('Orange'), 'pink' => __('Pink'), 'purple' => __('Purple'), 'red' => __('Red'),
- 'silver' => __('Silver'), 'tan' => __('Tan'), 'white' => __('White'), 'yellow' => __('Yellow'), 'dark' => __('Dark'),
- 'light' => __('Light'), 'Columns' => __('Columns'), 'one-column' => __('One Column'), 'two-columns' => __('Two Columns'),
- 'three-columns' => __('Three Columns'), 'four-columns' => __('Four Columns'), 'left-sidebar' => __('Left Sidebar'),
- 'right-sidebar' => __('Right Sidebar'), 'Width' => __('Width'), 'fixed-width' => __('Fixed Width'), 'flexible-width' => __('Flexible Width'),
- 'Features' => __('Features'), 'custom-colors' => __('Custom Colors'), 'custom-header' => __('Custom Header'), 'theme-options' => __('Theme Options'),
- 'threaded-comments' => __('Threaded Comments'), 'sticky-post' => __('Sticky Post'), 'microformats' => __('Microformats'),
- 'Subject' => __('Subject'), 'holiday' => __('Holiday'), 'photoblogging' => __('Photoblogging'), 'seasonal' => __('Seasonal'),
- );
</del><span class="cx">
</span><span class="cx"> foreach ( (array) $feature_list as $feature_name => $features ) {
</span><del>- if ( isset($trans[$feature_name]) )
- $feature_name = $trans[$feature_name];
</del><span class="cx"> $feature_name = esc_html( $feature_name );
</span><span class="cx"> echo '<div class="feature-name">' . $feature_name . '</div>';
</span><span class="cx">
</span><span class="cx"> echo '<ol style="float: left; width: 725px;" class="feature-group">';
</span><del>- foreach ( $features as $feature ) {
- $feature_name = $feature;
- if ( isset($trans[$feature]) )
- $feature_name = $trans[$feature];
</del><ins>+ foreach ( $features as $feature => $feature_name ) {
</ins><span class="cx"> $feature_name = esc_html( $feature_name );
</span><span class="cx"> $feature = esc_attr($feature);
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (15654 => 15655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-09-24 14:08:07 UTC (rev 15654)
+++ trunk/wp-admin/includes/theme.php 2010-09-24 15:28:28 UTC (rev 15655)
</span><span class="lines">@@ -250,4 +250,107 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Retrieve list of WordPress theme features (aka theme tags)
+ *
+ * @since 3.1.0
+ *
+ * @return array Array of features keyed by category with translations keyed by slug.
+ */
+function get_theme_feature_list() {
+ // Hard-coded list is used if api not accessible.
+ $features = array(
+ __('Colors') => array(
+ 'black' => __( 'Black' ),
+ 'blue' => __( 'Blue' ),
+ 'brown' => __( 'Brown' ),
+ 'green' => __( 'Green' ),
+ 'orange' => __( 'Orange' ),
+ 'pink' => __( 'Pink' ),
+ 'purple' => __( 'Purple' ),
+ 'red' => __( 'Red' ),
+ 'silver' => __( 'Silver' ),
+ 'tan' => __( 'Tan' ),
+ 'white' => __( 'White' ),
+ 'yellow' => __( 'Yellow' ),
+ 'dark' => __( 'Dark' ),
+ 'light' => __( 'Light ')
+ ),
+
+ __('Columns') => array(
+ 'one-column' => __( 'One Column' ),
+ 'two-columns' => __( 'Two Columns' ),
+ 'three-columns' => __( 'Three Columns' ),
+ 'four-columns' => __( 'Four Columns' ),
+ 'left-sidebar' => __( 'Left Sidebar' ),
+ 'right-sidebar' => __( 'Right Sidebar' )
+ ),
+
+ __('Width') => array(
+ 'fixed-width' => __( 'Fixed Width' ),
+ 'flexible-width' => __( 'Flexible Width' )
+ ),
+
+ __( 'Features' ) => array(
+ 'blavatar' => __( 'Blavatar' ),
+ 'buddypress' => __( 'BuddyPress' ),
+ 'custom-background' => __( 'Custom Background' ),
+ 'custom-colors' => __( 'Custom Colors' ),
+ 'custom-header' => __( 'Custom Header' ),
+ 'custom-menu' => __( 'Custom Menu' ),
+ 'editor-style' => __( 'Editor Style' ),
+ 'front-page-post-form' => __( 'Front Page Posting' ),
+ 'microformats' => __( 'Microformats' ),
+ 'sticky-post' => __( 'Sticky Post' ),
+ 'theme-options' => __( 'Theme Options' ),
+ 'threaded-comments' => __( 'Threaded Comments' ),
+ 'translation-ready' => __( 'Translation Ready' ),
+ 'rtl-language-support' => __( 'RTL Language Support' )
+ ),
+
+ __( 'Subject' ) => array(
+ 'holiday' => __( 'Holiday' ),
+ 'photoblogging' => __( 'Photoblogging' ),
+ 'seasonal' => __( 'Seasonal' )
+ )
+ );
+
+ if ( !current_user_can('install_themes') )
+ return $features;
+
+ if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
+ set_site_transient( 'wporg_theme_feature_list', array( ), 10800);
+
+ if ( !$feature_list ) {
+ $feature_list = themes_api( 'feature_list', array( ) );
+ if ( is_wp_error( $feature_list ) )
+ return $features;
+ }
+
+ if ( !$feature_list )
+ return $features;
+
+ set_site_transient( 'wporg_theme_feature_list', $feature_list, 10800 );
+
+ $category_translations = array( 'Colors' => __('Colors'), 'Columns' => __('Columns'), 'Width' => __('Width'),
+ 'Features' => __('Features'), 'Subject' => __('Subject') );
+
+ // Loop over the wporg canonical list and apply translations
+ $wporg_features = array();
+ foreach ( (array) $feature_list as $feature_category => $feature_items ) {
+ if ( isset($category_translations[$feature_category]) )
+ $feature_category = $category_translations[$feature_category];
+ $wporg_features[$feature_category] = array();
+
+ foreach ( $feature_items as $feature ) {
+ if ( isset($features[$feature_category][$feature]) )
+ $wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
+ else
+ $wporg_features[$feature_category][$feature] = $feature;
+ }
+ }
+
+ return $wporg_features;
+}
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>