diff --git a/packages/php/email-editor/src/Engine/Templates/class-templates.php b/packages/php/email-editor/src/Engine/Templates/class-templates.php index 5154d65001..49940b0b77 100644 --- a/packages/php/email-editor/src/Engine/Templates/class-templates.php +++ b/packages/php/email-editor/src/Engine/Templates/class-templates.php @@ -58,7 +58,7 @@ class Templates { } // If there is no user edited theme, look for default template themes in files. - ['prefix' => $templatePrefix, 'slug' => $templateSlug] = $this->utils->getTemplateIdParts( $templateId ); + ['prefix' => $templatePrefix, 'slug' => $templateSlug] = $this->utils->get_template_id_parts( $templateId ); if ( $this->pluginSlug !== $templatePrefix ) { return self::MAILPOET_TEMPLATE_EMPTY_THEME; @@ -76,7 +76,7 @@ class Templates { } public function getBlockFileTemplate( $return, $templateId, $template_type ) { - ['prefix' => $templatePrefix, 'slug' => $templateSlug] = $this->utils->getTemplateIdParts( $templateId ); + ['prefix' => $templatePrefix, 'slug' => $templateSlug] = $this->utils->get_template_id_parts( $templateId ); if ( $this->pluginSlug !== $templatePrefix ) { return $return; @@ -239,7 +239,7 @@ class Templates { } private function getBlockTemplateFromFile( string $template ) { - $template_slug = $this->utils->getBlockTemplateSlugFromPath( $template ); + $template_slug = $this->utils->get_block_template_slug_from_path( $template ); $templateObject = (object) array( 'slug' => $template_slug, 'id' => $this->pluginSlug . '//' . $template_slug, @@ -253,7 +253,7 @@ class Templates { $this->postType, ), ); - return $this->utils->buildBlockTemplateFromFile( $templateObject ); + return $this->utils->build_block_template_from_file( $templateObject ); } private function getCustomTemplates( $slugs = array(), $template_type = 'wp_template' ) { @@ -279,7 +279,7 @@ class Templates { return array_map( function ( $custom_template ) { - return $this->utils->buildBlockTemplateFromPost( $custom_template ); + return $this->utils->build_block_template_from_post( $custom_template ); }, $custom_templates ); diff --git a/packages/php/email-editor/src/Engine/Templates/class-utils.php b/packages/php/email-editor/src/Engine/Templates/class-utils.php index 30f8d909a5..781cf2934f 100644 --- a/packages/php/email-editor/src/Engine/Templates/class-utils.php +++ b/packages/php/email-editor/src/Engine/Templates/class-utils.php @@ -1,20 +1,28 @@ -name; - $templateSlug = $post->post_name; - $templateId = $templatePrefix . '//' . $templateSlug; + $template_prefix = $terms[0]->name; + $template_slug = $post->post_name; + $template_id = $template_prefix . '//' . $template_slug; $template = new WP_Block_Template(); $template->wp_id = $post->ID; - $template->id = $templateId; - $template->theme = $templatePrefix; + $template->id = $template_id; + $template->theme = $template_prefix; $template->content = $post->post_content ? $post->post_content : '
empty
'; - $template->slug = $templateSlug; + $template->slug = $template_slug; $template->source = 'custom'; $template->type = $post->post_type; $template->description = $post->post_excerpt; @@ -74,19 +94,25 @@ class Utils { return $template; } - public function buildBlockTemplateFromFile( $templateObject ): WP_Block_Template { + /** + * Build a block template from a file. + * + * @param object $template_object Template object. + * @return WP_Block_Template + */ + public function build_block_template_from_file( $template_object ): WP_Block_Template { $template = new WP_Block_Template(); - $template->id = $templateObject->id; - $template->theme = $templateObject->theme; - $template->content = (string) file_get_contents( $templateObject->path ); - $template->source = $templateObject->source; - $template->slug = $templateObject->slug; - $template->type = $templateObject->type; - $template->title = $templateObject->title; - $template->description = $templateObject->description; + $template->id = $template_object->id; + $template->theme = $template_object->theme; + $template->content = (string) file_get_contents( $template_object->path ); + $template->source = $template_object->source; + $template->slug = $template_object->slug; + $template->type = $template_object->type; + $template->title = $template_object->title; + $template->description = $template_object->description; $template->status = 'publish'; $template->has_theme_file = false; - $template->post_types = $templateObject->post_types; + $template->post_types = $template_object->post_types; $template->is_custom = false; // Templates are only custom if they are loaded from the DB. $template->area = 'uncategorized'; return $template;