Changeset 1106

Timestamp:

01/08/2015 06:53:48 PM (10 years ago)

Author:

iandunn

Message:

Central Theme: Make sure that the Twitter API response is an array.

If the request fails because of authentication then json_decode() will return null. That previously passed the success checks on the server and client sides, and resulted in empty output with no indication to the user that something went wrong.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012

Files:

• functions.php (modified) (1 diff)
• js/central.js (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php

@@ -469 +469 @@
                  * so we have to request more tweets than we actually want and then cut it down here.
                  */
-                if ( $tweets['tweets'] ) {
+                if ( is_array( $tweets['tweets'] ) ) {
                     $tweets['tweets']      = array_slice( $tweets['tweets'], 0, 3 );
                     $tweets['tweets']      = self::sanitize_format_tweets( $tweets['tweets'] );

sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/js/central.js

@@ -77 +77 @@
 
                 // Check for success
-                if ( response.hasOwnProperty( 'data' ) && response.data.hasOwnProperty( 'tweets' ) ) {
+                if ( response.hasOwnProperty( 'data' ) && response.data.hasOwnProperty( 'tweets' ) && response.data.tweets === Array ) {
                     tweets = response.data.tweets;
                 } else {