Skip to content

active and enabled #736

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

Merged
merged 2 commits into from
Apr 19, 2022
Merged

active and enabled #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe66ed
active and enabled
DavidCramer Apr 14, 2022
e7a0958
convert ? to &
DavidCramer Apr 19, 2022
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
2 changes: 1 addition & 1 deletion php/class-delivery-feature.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function enqueue_assets() {
* @return bool
*/
public function is_enabled() {
return 'on' === $this->config[ $this->enable_slug ];
return $this->is_active() && 'on' === $this->config[ $this->enable_slug ];
}

/**
Expand Down
12 changes: 8 additions & 4 deletions php/class-delivery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,9 +890,11 @@ public function convert_tags( $content, $context = 'view' ) {
if ( empty( $relation['public_id'] || $url === $relation['public_id'] ) ) {
continue; // We don't need the public_id relation item.
}
$base = $type . ':' . $url;
$public_id = ! is_admin() ? $relation['public_id'] . '.' . $relation['format'] : null;
$aliases[ $base ] = $this->media->cloudinary_url( $relation['post_id'], array(), $relation['transformations'], $public_id );
$base = $type . ':' . $url;
$public_id = ! is_admin() ? $relation['public_id'] . '.' . $relation['format'] : null;
$cloudinary_url = $this->media->cloudinary_url( $relation['post_id'], array(), $relation['transformations'], $public_id );
$aliases[ $base . '?' ] = $cloudinary_url . '&';
$aliases[ $base ] = $cloudinary_url;
}

// Create the sized found relations second.
Expand All @@ -909,7 +911,9 @@ public function convert_tags( $content, $context = 'view' ) {
$aliases[ $local_url ] = $cached[ $local_url ];
continue;
}
$aliases[ $local_url ] = $this->media->cloudinary_url( $relation['post_id'], explode( 'x', $size ), $relation['transformations'], $public_id );
$cloudinary_url = $this->media->cloudinary_url( $relation['post_id'], explode( 'x', $size ), $relation['transformations'], $public_id );
$aliases[ $local_url . '?' ] = $cloudinary_url . '&';
$aliases[ $local_url ] = $cloudinary_url;
}
}

Expand Down
10 changes: 10 additions & 0 deletions php/class-svg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,16 @@ public function maybe_setup_metadata( $attachment_id, $result ) {
}
}

/**
* Check if component is active.
*
* @return bool
*/
public function is_active() {
// It's always active if on.
return 'on' === $this->config[ $this->enable_slug ];
}

/**
* Setup the component
*/
Expand Down