| @@ -322,9 +322,9 @@ | ||
| 322 | 322 | $zenfolio_params['loginName'] = $attr['login_name']; |
| 323 | 323 | break; |
| 324 | 324 | |
| 325 | 325 | case 'group': |
| 326 | - if (empty($object_id)) { | |
| 326 | + if (empty($attr['object_id'])) { | |
| 327 | 327 | $this->pop_from_stack(); |
| 328 | 328 | return [ |
| 329 | 329 | new Error( |
| 330 | 330 | sprintf(esc_html__('The %s parameter is required.', 'photonic'), '<code>object_id</code>') . |
| @@ -331,8 +331,12 @@ | ||
| 331 | 331 | Photonic::doc_link($this->doc_links['groups']) |
| 332 | 332 | ) |
| 333 | 333 | ]; |
| 334 | 334 | } |
| 335 | + else { | |
| 336 | + $object_id = $attr['object_id']; | |
| 337 | + } | |
| 338 | + | |
| 335 | 339 | $chained_methods[] = 'LoadGroup'; |
| 336 | 340 | $f = stripos($object_id, 'f'); |
| 337 | 341 | if (false !== $f) { |
| 338 | 342 | $object_id = substr($object_id, $f + 1); |
| @@ -559,9 +563,9 @@ | ||
| 559 | 563 | * @param array $short_code |
| 560 | 564 | * @param Pagination|null $pagination |
| 561 | 565 | * @return Photo_List|Error |
| 562 | 566 | */ |
| 563 | - private function process_photos($response, $parent, $short_code, Pagination $pagination) { | |
| 567 | + private function process_photos($response, string $parent, array $short_code, Pagination $pagination) { | |
| 564 | 568 | if (!is_array($response)) { |
| 565 | 569 | if (empty($response->Photos) || !is_array($response->Photos)) { |
| 566 | 570 | return new Error(esc_html__('Response is not an array', 'photonic')); |
| 567 | 571 | } |
| @@ -650,9 +654,9 @@ | ||
| 650 | 654 | |
| 651 | 655 | return $photo_objects; |
| 652 | 656 | } |
| 653 | 657 | |
| 654 | - public function build_level_2_objects($objects_or_response, array $short_code, array $filter_list = [], array &$options = [], ?Pagination &$pagination = null): array { | |
| 658 | + public function build_level_2_objects($objects_or_response, array $short_code, array $filter_list = [], array $options = [], ?Pagination &$pagination = null): array { | |
| 655 | 659 | global $photonic_zenfolio_hide_password_protected_thumbnail, $photonic_gallery_template_page; |
| 656 | 660 | $tile_size = (empty($short_code['tile_size']) || 'same' === $short_code['tile_size']) ? $short_code['main_size'] : $short_code['tile_size']; |
| 657 | 661 | |
| 658 | 662 | $sizes = [ |