Changeset 3610

Timestamp:

07/01/2016 09:12:17 AM (10 years ago)

Author:

ocean90

Message:

Trac Components: Fix single component pages.

• Quick fix to a data type change in the shift from MySQL to SQLite, see [3604].
• Bail out if API returns no results.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-components.php

@@ -339 +339 @@
         function generate_component_breakdowns() {
                 if ( isset( $this->breakdown_component_type, $this->breakdown_component_milestone_type, $this->breakdown_component_unreplied ) ) {
-                        return;
+                        return true;
                 }
 
@@ -346 +346 @@
                 if ( ! $rows ) {
                         $rows = $this->api->get_tickets_by_component_type_milestone();
+                        if ( ! $rows ) {
+                                return false; // API error.
+                        }
                         wp_cache_add( 'trac_tickets_by_component_type_milestone', $rows, '', 300 );
                 }
 
                 foreach ( $rows as $row ) {
+                        $row = (object) $row;
                         if ( empty( $component_type[ $row->component ] ) ) {
                                 $component_type[ $row->component ] = $type_filled;
@@ -370 +374 @@
                 $this->breakdown_component_milestone_type = $component_milestone_type;
                 $this->breakdown_component_unreplied = $component_unreplied;
-        }
-
-        function ticket_table( $component  ) {
-                $this->generate_component_breakdowns();
+
+                return true;
+        }
+
+        function ticket_table( $component ) {
+                $result = $this->generate_component_breakdowns();
+                if ( ! $result ) {
+                        return;
+                }
+
                 $component_type = $this->breakdown_component_type;
                 $component_milestone_type = $this->breakdown_component_milestone_type;
@@ -457 +467 @@
                 if ( $next_milestone ) {
                         $count = count( $next_milestone );
-                        echo '<h3>' . sprintf( _n( '%s ticket slated for ' . $next_milestone[0]->milestone, '%s tickets slated for ' . $next_milestone[0]->milestone, $count ), $count ) . '</h3>';
-                        echo $this->trac_query_link( 'View list in Trac', array( 'component' => $component, 'milestone' => $next_milestone[0]->milestone ) );
+                        $next_milestone_object = (object) $next_milestone[0];
+                        echo '<h3>' . sprintf( _n( '%s ticket slated for ' . $next_milestone_object->milestone, '%s tickets slated for ' . $next_milestone_object->milestone, $count ), $count ) . '</h3>';
+                        echo $this->trac_query_link( 'View list in Trac', array( 'component' => $component, 'milestone' => $next_milestone_object->milestone ) );
                         $this->render_tickets( $next_milestone );
                 }
@@ -555 +566 @@
 
         function component_table_row( $post ) {
+                $result = $this->generate_component_breakdowns();
+                if ( ! $result ) {
+                        return;
+                }
+
                 static $once = true;
                 if ( $once ) {
@@ -562 +578 @@
 
                 $component = $post->post_title;
-                $this->generate_component_breakdowns();
                 $history = $this->api->get_component_history( $component );