Changeset 2028

Timestamp:

11/02/2015 05:34:45 AM (9 years ago)

Author:

nacin

Message:

Trac Notifications type fixes.

Location:

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

Files:

• trac-notifications-db.php (modified) (2 diffs)
• trac-notifications-http-server.php (modified) (2 diffs)

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

@@ -129 +129 @@
     function get_trac_ticket_subscriptions( $ticket_id ) {
         $by_status = array( 'blocked' => array(), 'starred' => array() );
-        $subscriptions = $this->db->get_results( $this->db->prepare( "SELECT username, status FROM _ticket_subs WHERE ticket = %s", $ticket_id ) );
+        $subscriptions = $this->db->get_results( $this->db->prepare( "SELECT username, status FROM _ticket_subs WHERE ticket = %d", $ticket_id ) );
         foreach ( $subscriptions as $subscription ) {
             $by_status[ $subscription->status ? 'starred' : 'blocked' ][] = $subscription->username;
@@ -137 +137 @@
 
     function get_trac_ticket_subscription_status_for_user( $ticket_id, $username ) {
-        $status = $this->db->get_var( $this->db->prepare( "SELECT status FROM _ticket_subs WHERE username = %s AND ticket = %s", $username, $ticket_id ) );
+        $status = $this->db->get_var( $this->db->prepare( "SELECT status FROM _ticket_subs WHERE username = %s AND ticket = %d", $username, $ticket_id ) );
         if ( null !== $status ) {
             $status = (int) $status;

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

@@ -16 +16 @@
     function serve( $method, $secret, $arguments ) {
         if ( ! method_exists( 'Trac_Notifications_DB', $method ) || $method[0] === '_' ) {
-            exit( 'null' );
+            exit;
         }
 
         if ( $secret !== $this->secret ) {
-            exit( 'null' );
+            exit;
         }
 
@@ -30 +30 @@
 
         echo json_encode( $result );
-        die;
+        exit;
     }
 }