Skip to content

Prevent assigning error to $this->usage #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kienstra wants to merge 4 commits into from
Closed

Prevent assigning error to $this->usage #40

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56e9a9d
Prevent saving error as $this->usage
kienstra Jan 30, 2020
28bceed
Restore check for is_wp_error()
kienstra Jan 30, 2020
a8e69f9
Exit if the API call returned a WP_Error
kienstra Jan 30, 2020
8a555c2
Remove needless empty line
kienstra Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,12 @@ public function setup() {
if ( empty( $stats ) ) {
// Get users plan.
$stats = $this->plugin->components['connect']->api->usage();
if ( ! is_wp_error( $stats ) && ! empty( $stats['media_limits'] ) ) {

if ( is_wp_error( $stats ) ) {
return;
}

if ( ! empty( $stats['media_limits'] ) ) {
Comment on lines +285 to +290
Copy link
Contributor

@parabrola parabrola Jan 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be a better idea to set some defaults before returning if there's a WP_Error since there are 5 uses of its keys around the plugin, which might cause undefined index errors.

  • See class-media.php at line 1079-1080
  • See class-push-sync.php at line 340-341
  • See class-upload-sync.php at line 120

What do you think @kienstra ?

Copy link
Contributor Author

@kienstra kienstra Jan 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uf, good point

$stats['max_image_size'] = $stats['media_limits']['image_max_size_bytes'];
$stats['max_video_size'] = $stats['media_limits']['video_max_size_bytes'];
set_transient( '_cloudinary_usage', $stats, HOUR_IN_SECONDS );
Expand Down