<!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>[1572] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Themes Directory: Upon plugin activation, convert the current site into the Themes Directory (set it's requirements).</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 { 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/1572">1572</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/1572","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-14 07:01:22 +0000 (Thu, 14 May 2015)</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'>Themes Directory: Upon plugin activation, convert the current site into the Themes Directory (set it's requirements).
This changeset also includes moving from hard-coded blog ID's to a constant for easier testing.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></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/theme-directory/theme-directory.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/theme-directory/theme-directory.php      2015-05-13 23:17:13 UTC (rev 1571)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php        2015-05-14 07:01:22 UTC (rev 1572)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,47 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * Things to change on activation.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_activate() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        global $wp_rewrite;
+
+       // Setup the environment
</ins><span class="cx" style="display: block; padding: 0 10px">         wporg_themes_init();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       // %postname% is required
+       $wp_rewrite->set_permalink_structure( '/%postname%/' );
+
+       // /tags/%slug% is required for tags
+       $wp_rewrite->set_tag_base( '/tags' );
+
+       /*
+        * Create the `commercial`, `getting-started` and `upload` pages
+        * These titles are not translated, as they're not displayed anywhere.
+        * The theme has specific templates for these slugs.
+        */
+       foreach ( array( 'commercial', 'getting-started', 'upload' ) as $page_slug ) {
+               if ( get_page_by_path( $page_slug ) ) {
+                       continue;
+               }
+               wp_insert_post( array(
+                       'post_type'   => 'page',
+                       'post_title'  => $page_slug,
+                       'post_name'   => $page_slug,
+                       'post_status' => 'publish'
+               ) );
+       }
+
+       // We require the WordPress.org Ratings plugin also be active
+       if ( ! is_plugin_active( 'wporg-ratings/wporg-ratings.php' ) ) {
+               activate_plugin( 'wporg-ratings/wporg-ratings.php' );
+       }
+
+       // Enable the WordPress.org Theme Repo Theme
+       foreach ( wp_get_themes() as $theme ) {
+               if ( $theme->get( 'Name' ) === 'WP.org Themes' ) {
+                       switch_theme( $theme->get_stylesheet() );
+                       break;
+               }
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        do_action( 'wporg_themes_activation' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,6 +150,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">        add_rewrite_tag( '%browse%', '(featured|popular|new)' );
</span><span class="cx" style="display: block; padding: 0 10px">        add_permastruct( 'browse', 'browse/%browse%' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ( ! defined( 'WPORG_THEME_DIRECTORY_BLOGID' ) ) {
+               define( 'WPORG_THEME_DIRECTORY_BLOGID', get_current_blog_id() );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wporg_themes_init' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +642,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_query_api( $method, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px">        include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.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">-        switch_to_blog( 35 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_to_blog( WPORG_THEME_DIRECTORY_BLOGID );
</ins><span class="cx" style="display: block; padding: 0 10px">         $api = new Themes_API( $method, $args );
</span><span class="cx" style="display: block; padding: 0 10px">        restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryuploadphp"></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/theme-directory/upload.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/theme-directory/upload.php       2015-05-13 23:17:13 UTC (rev 1571)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php 2015-05-14 07:01:22 UTC (rev 1572)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                include_once plugin_dir_path( __FILE__ ) . 'class-wporg-themes-upload.php';
</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">+        switch_to_blog( WPORG_THEME_DIRECTORY_BLOGID );
+
</ins><span class="cx" style="display: block; padding: 0 10px">         $upload = new WPORG_Themes_Upload;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $message = $upload->process_upload();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        return $upload->process_upload();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restore_current_blog();
+
+       return $message;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>