Changeset 1002254

Timestamp:

10/06/2014 01:52:22 AM (11 years ago)

Author:

captaintheme

Message:

bug fix

Location:

wp-done-this

Files:

• tags/1.0.0/includes/class-wp-done-this.php (modified) (3 diffs)
• trunk/includes/class-wp-done-this.php (modified) (3 diffs)

wp-done-this/tags/1.0.0/includes/class-wp-done-this.php

@@ -175 +175 @@
                             $team_slug = get_the_author_meta( 'wpdonethis_team_slug', $current_user );
 
-                            // Check if transient for authenticate data exists, if not - set it!
-                            if ( false === ( $authenticate = get_transient( 'wpdonethis_authenticate' ) ) ) {
-
-                                $authenticate = $wp_done_this_api->authenticate( $api_key, $team_slug );
-                                set_transient( 'wpdonethis_authenticate', $authenticate, 30 * DAY_IN_SECONDS ); // save for a month
-
-                            }
-
                             // Transient for API owner
                             if ( false === ( $owner = get_transient( 'wpdonethis_owner' ) ) ) {
@@ -190 +182 @@
 
                             }
+
+                            // Check if transient for authenticate data exists, if not - set it!
+                            $authenticate = get_transient( 'wpdonethis_authenticate' );
                                 
                             if ( $authenticate == 1 ) {
@@ -239 +234 @@
             update_usermeta( $user_id, 'wpdonethis_team_slug', sanitize_text_field( $_POST['wpdonethis_team_slug'] ) );
 
+            $api_key = get_the_author_meta( 'wpdonethis_api_key', $user_id );
+            $team_slug = get_the_author_meta( 'wpdonethis_team_slug', $user_id );
+
             // Delete auth transient on settings save
-            if ( get_transient( 'wpdonethis_authenticate' ) ) {
-                delete_transient( 'wpdonethis_authenticate' );
-            }
-
+            delete_transient( 'wpdonethis_authenticate' );
+            
             // Delete owner transient on settings save
-            if ( get_transient( 'wpdonethis_owner' ) ) {
-                delete_transient( 'wpdonethis_owner' );
+            delete_transient( 'wpdonethis_owner' );
+
+            // Check if transient for authenticate data exists, if not - set it!
+            if ( false === ( $authenticate = get_transient( 'wpdonethis_authenticate' ) ) && $api_key ) {
+
+                $authenticate = $wp_done_this_api->authenticate( $api_key, $team_slug );
+                set_transient( 'wpdonethis_authenticate', $authenticate, 30 * DAY_IN_SECONDS ); // save for a month
+
             }
 

wp-done-this/trunk/includes/class-wp-done-this.php

@@ -175 +175 @@
                             $team_slug = get_the_author_meta( 'wpdonethis_team_slug', $current_user );
 
-                            // Check if transient for authenticate data exists, if not - set it!
-                            if ( false === ( $authenticate = get_transient( 'wpdonethis_authenticate' ) ) ) {
-
-                                $authenticate = $wp_done_this_api->authenticate( $api_key, $team_slug );
-                                set_transient( 'wpdonethis_authenticate', $authenticate, 30 * DAY_IN_SECONDS ); // save for a month
-
-                            }
-
                             // Transient for API owner
                             if ( false === ( $owner = get_transient( 'wpdonethis_owner' ) ) ) {
@@ -190 +182 @@
 
                             }
+
+                            // Check if transient for authenticate data exists, if not - set it!
+                            $authenticate = get_transient( 'wpdonethis_authenticate' );
                                 
                             if ( $authenticate == 1 ) {
@@ -239 +234 @@
             update_usermeta( $user_id, 'wpdonethis_team_slug', sanitize_text_field( $_POST['wpdonethis_team_slug'] ) );
 
+            $api_key = get_the_author_meta( 'wpdonethis_api_key', $user_id );
+            $team_slug = get_the_author_meta( 'wpdonethis_team_slug', $user_id );
+
             // Delete auth transient on settings save
-            if ( get_transient( 'wpdonethis_authenticate' ) ) {
-                delete_transient( 'wpdonethis_authenticate' );
-            }
-
+            delete_transient( 'wpdonethis_authenticate' );
+            
             // Delete owner transient on settings save
-            if ( get_transient( 'wpdonethis_owner' ) ) {
-                delete_transient( 'wpdonethis_owner' );
+            delete_transient( 'wpdonethis_owner' );
+
+            // Check if transient for authenticate data exists, if not - set it!
+            if ( false === ( $authenticate = get_transient( 'wpdonethis_authenticate' ) ) && $api_key ) {
+
+                $authenticate = $wp_done_this_api->authenticate( $api_key, $team_slug );
+                set_transient( 'wpdonethis_authenticate', $authenticate, 30 * DAY_IN_SECONDS ); // save for a month
+
             }