Changeset 1115

Timestamp:

01/09/2015 03:53:03 AM (10 years ago)

Author:

obenland

Message:

Theme Directory: Remove bundled trac class.

There is an IXR class on dotorg that is the same as the one in core, except
that it was modified to handle SSL connections. The Trac class was originally
written with this dotorg IXR class in mind. Here, we're switching to that class
and add support for WP_IXR_HTTP_Client, which is what WordPress uses when it
uses the IXR class, so we can connect to Trac installs that are SSL.
Soon, this Trac library will be placed in a common includes directory; for now,
we update it to use what is already on dotorg elsewhere.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• class-trac.php (deleted)
• class-wporg-themes-upload.php (modified) (1 diff)
• theme-directory.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -491 +491 @@
         if ( empty( $this->trac ) ) {
             if ( ! class_exists( 'Trac' ) ) {
-                include_once plugin_dir_path( __FILE__ ) . 'class-trac.php';
+                require_once ABSPATH . WPINC . '/class-IXR.php';
+                require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+                require_once WPORGPATH . 'bb-theme/themes/lib/class-trac.php';
             }
 
-            $this->trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'themes.trac.wordpress.org', '/login/xmlrpc', 443, true /* is_ssl() */ );
+            $this->trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'https://themes.trac.wordpress.org/login/xmlrpc' );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -127 +127 @@
 
     if ( ! class_exists( 'Trac' ) ) {
-        include_once plugin_dir_path( __FILE__ ) . 'class-trac.php';
-    }
-
-    $trac         = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'themes.trac.wordpress.org', '/login/xmlrpc', 443, true );
+        require_once ABSPATH . WPINC . '/class-IXR.php';
+        require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+        require_once WPORGPATH . 'bb-theme/themes/lib/class-trac.php';
+    }
+
+    $trac         = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'https://themes.trac.wordpress.org/login/xmlrpc' );
     $last_request = get_option( 'wporg-themes-last-trac-sync', strtotime( '-2 days' ) );