Changeset 607624

Timestamp:

10/03/2012 07:46:42 PM (13 years ago)

Author:

jascott

Message:

kickpress_api::get_custom_field_values() must return values for even hidden fields

Location:

kickpress/trunk

Files:

• kickpress-api.php (modified) (2 diffs)
• kickpress-oauth.php (modified) (7 diffs)
• kickpress-redirects.php (modified) (1 diff)

kickpress/trunk/kickpress-api.php

@@ -805 +805 @@
     }
 
-    /* Used exclusively for exporting purposes */
+    /* Used exclusively for exporting purposes - NOT TRUE */
     public function get_custom_field_values( $post_id, $merge = true ) {
         $skip_post_vars = array('ID','post_author','post_date','post_date_gmt','post_content','post_title','post_category','post_excerpt','post_status','comment_status','ping_status','post_password','post_name','to_ping','pinged','post_modified','post_modified_gmt','post_content_filtered','post_parent','guid','menu_order','post_type','post_mime_type','comment_count','tags_input','categories_input','_thumbnail_id');
@@ -811 +811 @@
 
         foreach ( $this->get_custom_fields( $merge ) as $key => $field ) {
-            if ( empty( $field[ 'name' ] ) || 
-                ( isset( $field[ 'exportable' ] ) && ! $field[ 'exportable' ] ) || 
-                in_array( $field[ 'name' ], $skip_post_vars ) ) {
+            if ( empty( $field[ 'name' ] ) || in_array( $field[ 'name' ], $skip_post_vars ) ) {
+                //( isset( $field[ 'exportable' ] ) && ! $field[ 'exportable' ] ) ) {
                 continue;
             }

kickpress/trunk/kickpress-oauth.php

@@ -340 +340 @@
         if ( is_wp_error( $consumer ) ) {
             die( self::normalize_params( array(
-                'oauth_error' => $consumer->get_error_message( 'oauth_error' )
+                'oauth_error'             => $consumer->get_error_code(),
+                'oauth_error_description' => $consumer->get_error_message()
             ) ) );
         } else {
@@ -376 +377 @@
         
         if ( is_wp_error( $consumer ) ) {
-            die( http_build_query( array(
-                'oauth_error' => $consumer->get_error_message( 'oauth_error' )
+            die( self::normalize_params( array(
+                'oauth_error'             => $consumer->get_error_code(),
+                'oauth_error_description' => $consumer->get_error_message()
             ) ) );
         } else {
@@ -410 +412 @@
                 } else {
                     die( self::normalize_params( array(
-                        'oauth_error' => 'Failed to validate oauth consumer key'
+                        'oauth_error' => 'invalid_client'
                     ) ) );
                 }
             } else {
                 die( self::normalize_params( array(
-                    'oauth_error' => 'Failed to validate oauth token'
+                    'oauth_error' => 'invalid_request'
                 ) ) );
             }
@@ -577 +579 @@
                                 $consumer->set_verifier( $verifier );
                             } else {
-                                return new WP_Error( 'oauth_error',
+                                return new WP_Error( 'invalid_request',
                                     'Failed to verify oauth request' );
                             }
@@ -601 +603 @@
                         $consumer->set_token( $token, $token_secret );
                     } else {
-                        /* return new WP_Error( 'oauth_error',
-                            'Failed to validate oauth token' ); */
+                        return new WP_Error( 'invalid_request',
+                            'Failed to validate oauth token' );
                     }
                 }
@@ -617 +619 @@
                             $consumer->set_callback( $oauth_callback );
                         } else {
-                            return new WP_Error( 'oauth_error',
+                            return new WP_Error( 'callback_uri_mismatch',
                                 'Failed to validate oauth callback' );
                         }
@@ -624 +626 @@
                     return $consumer;
                 } else {
-                    return new WP_Error( 'oauth_error',
+                    return new WP_Error( 'invalid_client',
                         'Failed to validate oauth signature and token' );
                 }
             } else {
-                return new WP_Error( 'oauth_error',
+                return new WP_Error( 'invalid_client',
                     'Failed to validate oauth signature' );
             }
         } else {
-            return new WP_Error( 'oauth_error',
+            return new WP_Error( 'invalid_request',
                 'Failed to validate oauth signature' );
         }

kickpress/trunk/kickpress-redirects.php

@@ -250 +250 @@
                 $kickpress_api->params['view_alias'] = $first_param;
                 $kickpress_api->params['format'] = $format;
+
+                if ( ! empty( $other_params ) )
+                    $kickpress_api->params['extra'] = $other_params;
             }