Merge branch 'release/1.19.11'

siteorigin · Feb 8, 2023 · fc035c1 · fc035c1
2 parents afb8892 + 36e1346
commit fc035c1
Show file tree

Hide file tree

Showing 59 changed files with 1,640 additions and 1,542 deletions.
diff --git a/404.php b/404.php
@@ -2,12 +2,10 @@
 /**
  * The template for displaying 404 pages (not found).
  *
- * @link https://codex.wordpress.org/Creating_an_Error_404_Page
+ * @see https://codex.wordpress.org/Creating_an_Error_404_Page
  *
- * @package siteorigin-corp
- * @license GPL 2.0 
+ * @license GPL 2.0
  */
-
 get_header(); ?>
 
 	<div id="primary" class="content-area">

diff --git a/admin/about/page-documentation.php b/admin/about/page-documentation.php
@@ -1,4 +1,4 @@
-<h3><?php esc_html_e( 'Detailed Documentation', 'siteorigin-corp' ) ?></h3>
+<h3><?php esc_html_e( 'Detailed Documentation', 'siteorigin-corp' ); ?></h3>
 <p>
-	<?php printf( esc_html__( "Corp offers %sdetailed documentation%s covering everything from basic setup to advanced customizations.", 'siteorigin-corp' ), '<a href="https://siteorigin.com/corp-documentation/">', '</a>' ) ?>
+	<?php printf( esc_html__( 'Corp offers %sdetailed documentation%s covering everything from basic setup to advanced customizations.', 'siteorigin-corp' ), '<a href="https://siteorigin.com/corp-documentation/">', '</a>' ); ?>
 </p>
diff --git a/admin/about/page-free.php b/admin/about/page-free.php
@@ -1,5 +1,5 @@
-<h3><?php esc_html_e( 'Forever Free', 'siteorigin-corp' ) ?></h3>
+<h3><?php esc_html_e( 'Forever Free', 'siteorigin-corp' ); ?></h3>
 <p>
-	<?php esc_html_e( "Corp is a completely free WordPress theme.", 'siteorigin-corp' ); ?>
+	<?php esc_html_e( 'Corp is a completely free WordPress theme.', 'siteorigin-corp' ); ?>
 	<?php esc_html_e( "We'll continue developing and enhancing it for years to come.", 'siteorigin-corp' ); ?>
 </p>
diff --git a/admin/about/page-github.php b/admin/about/page-github.php
@@ -1,6 +1,6 @@
 <h3><?php esc_html_e( 'Developed on Github', 'siteorigin-corp' ); ?></h3>
 <img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
 <p>
-	<?php printf( esc_html__( "Actively %sdeveloped on Github%s.", 'siteorigin-corp' ), '<a href="https://github.com/siteorigin/siteorigin-corp">', '</a>' ); ?>
+	<?php printf( esc_html__( 'Actively %sdeveloped on Github%s.', 'siteorigin-corp' ), '<a href="https://github.com/siteorigin/siteorigin-corp">', '</a>' ); ?>
 	<?php esc_html_e( "You can watch what's happening with Corp's development and even make contributions yourself.", 'siteorigin-corp' ); ?>
 </p>
diff --git a/admin/about/page-page-builder.php b/admin/about/page-page-builder.php
@@ -1,5 +1,5 @@
 <h3><?php esc_html_e( 'Enhanced by Page Builder', 'siteorigin-corp' ); ?></h3>
 <p>
-	<?php printf( esc_html__( "Corp integrates, beautifully, with our %sfree Page Builder%s plugin.", 'siteorigin-corp' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ); ?>
+	<?php printf( esc_html__( 'Corp integrates, beautifully, with our %sfree Page Builder%s plugin.', 'siteorigin-corp' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ); ?>
 	<?php esc_html_e( 'This powerful plugin gives you full drag and drop capabilities right inside Corp.', 'siteorigin-corp' ); ?>
 </p>
diff --git a/admin/about/page-woocommerce.php b/admin/about/page-woocommerce.php
@@ -1,6 +1,6 @@
 <h3><?php esc_html_e( 'WooCommerce Integration', 'siteorigin-corp' ); ?></h3>
 <img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
 <p>
-	<?php esc_html_e( "Corp is a full-featured WooCommerce theme.", 'siteorigin-corp' ); ?>
-	<?php esc_html_e( "Use it to build your complete online store with a stunning design and features.", 'siteorigin-corp' ); ?>
+	<?php esc_html_e( 'Corp is a full-featured WooCommerce theme.', 'siteorigin-corp' ); ?>
+	<?php esc_html_e( 'Use it to build your complete online store with a stunning design and features.', 'siteorigin-corp' ); ?>
 </p>
diff --git a/archive-jetpack-portfolio.php b/archive-jetpack-portfolio.php
@@ -2,23 +2,22 @@
 /**
  * The template for displaying Jetpack Portfolio archive pages.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @see https://codex.wordpress.org/Template_Hierarchy
  *
- * @package siteorigin-corp
- * @license GPL 2.0 
+ * @license GPL 2.0
  */
 get_header(); ?>
 
 	<div id="primary" class="content-area">
 		<main id="main" class="site-main">
-			<?php if ( siteorigin_page_setting( 'page_title' ) && siteorigin_page_setting( 'overlap' ) == 'disabled' ) : ?>
+			<?php if ( siteorigin_page_setting( 'page_title' ) && siteorigin_page_setting( 'overlap' ) == 'disabled' ) { ?>
 				<header class="page-header">
-					<?php 
-						the_archive_title( '<h1 class="page-title">', '</h1>' ); 
-						the_archive_description( '<div class="taxonomy-description">', '</div>' );
-					?>
+					<?php
+					the_archive_title( '<h1 class="page-title">', '</h1>' );
+				the_archive_description( '<div class="taxonomy-description">', '</div>' );
+				?>
 				</header><!-- .page-header -->
-			<?php endif; ?>
+			<?php } ?>
 
 			<?php get_template_part( 'loops/loop', 'portfolio' ); ?>
 

diff --git a/archive.php b/archive.php
@@ -2,63 +2,55 @@
 /**
  * The template for displaying archive pages.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @see https://codex.wordpress.org/Template_Hierarchy
  *
- * @package siteorigin-corp
- * @license GPL 2.0 
+ * @license GPL 2.0
  */
 get_header(); ?>
 
 	<div id="primary" class="content-area">
 		<main id="main" class="site-main">
-			<?php if ( siteorigin_page_setting( 'page_title' ) && siteorigin_page_setting( 'overlap' ) == 'disabled' ) : ?>
+			<?php if ( siteorigin_page_setting( 'page_title' ) && siteorigin_page_setting( 'overlap' ) == 'disabled' ) { ?>
 				<header class="page-header">
-					<?php 
-						the_archive_title( '<h1 class="page-title">', '</h1>' ); 
-						the_archive_description( '<div class="taxonomy-description">', '</div>' );
-					?>
+					<?php
+					the_archive_title( '<h1 class="page-title">', '</h1>' );
+				the_archive_description( '<div class="taxonomy-description">', '</div>' );
+				?>
 				</header><!-- .page-header -->
-			<?php endif; ?>
+			<?php } ?>
 
 			<?php
-			if ( is_tax( 'jetpack-portfolio-type' ) || is_tax( 'jetpack-portfolio-tag' ) ) :
-
-				if ( have_posts() ) : ?>
+			if ( is_tax( 'jetpack-portfolio-type' ) || is_tax( 'jetpack-portfolio-tag' ) ) {
+				if ( have_posts() ) { ?>
 
 					<div class="portfolio-archive-layout">
 						<?php
 						/* Start the Loop */
-						while ( have_posts() ) : the_post();
+						while ( have_posts() ) {
+							the_post();
 
 							get_template_part( 'template-parts/content', 'portfolio' );
-
-						endwhile;
+						}
 						?>
 					</div><?php
 
-					if ( is_rtl() ) :
-						the_posts_pagination( array( 
-							'prev_text' => '&rarr;', 
-							'next_text' => '&larr;' 
+					if ( is_rtl() ) {
+						the_posts_pagination( array(
+							'prev_text' => '&rarr;',
+							'next_text' => '&larr;',
 						) );
-					else :
-						the_posts_pagination( array( 
-							'prev_text' => '&larr;', 
-							'next_text' => '&rarr;' 
+					} else {
+						the_posts_pagination( array(
+							'prev_text' => '&larr;',
+							'next_text' => '&rarr;',
 						) );
-					endif;
-
-				else :
-
+					}
+				} else {
 					get_template_part( 'template-parts/content', 'none' );
-
-				endif;
-
-			else :
-
+				}
+			} else {
 				get_template_part( 'loops/loop', 'blog-' . siteorigin_setting( 'blog_archive_layout' ) );
-
-			endif;
+			}
 			?>
 
 		</main><!-- #main -->

diff --git a/comments.php b/comments.php
@@ -5,9 +5,8 @@
  * This is the template that displays the area of the page that contains both the current comments
  * and the comment form.
  *
- * @link https://codex.wordpress.org/Template_Hierarchy
+ * @see https://codex.wordpress.org/Template_Hierarchy
  *
- * @package siteorigin-corp
  * @license GPL 2.0
  */
 
@@ -24,33 +23,34 @@
 <div id="comments" class="comments-area">
 
 	<?php
-	if ( have_comments() ) : ?>
+	if ( have_comments() ) { ?>
 		<h2 class="comments-title">
 			<?php
 			$comment_count = get_comments_number();
-			if ( 1 === $comment_count ) {
-				printf(
-					/* Translators: 1: title. */
-					esc_html_e( '1 Comment', 'siteorigin-corp' ),
-					'<span>' . get_the_title() . '</span>'
-				);
-			} else {
-				printf( // WPCS: XSS OK.
-					/* Translators: 1: comment count number, 2: title. */
-					esc_html( _nx( '%1$s Comment', '%1$s Comments', $comment_count, 'comments title', 'siteorigin-corp' ) ),
-					number_format_i18n( $comment_count ),
-					'<span>' . get_the_title() . '</span>'
-				);
-			}
-			?>
-		</h2><!--. comments-title -->
 
-		<?php 
-			$args = array(
-				'prev_text' => '<span class="icon-long-arrow-left"></span> ' . esc_html__( 'Older comments', 'siteorigin-corp' ),
-				'next_text' => esc_html__( 'Newer comments', 'siteorigin-corp' ) . ' <span class="icon-long-arrow-right"></span>',
+		if ( 1 === $comment_count ) {
+			printf(
+				/* Translators: 1: title. */
+				esc_html_e( '1 Comment', 'siteorigin-corp' ),
+				'<span>' . get_the_title() . '</span>'
+			);
+		} else {
+			printf( // WPCS: XSS OK.
+				/* Translators: 1: comment count number, 2: title. */
+				esc_html( _nx( '%1$s Comment', '%1$s Comments', $comment_count, 'comments title', 'siteorigin-corp' ) ),
+				number_format_i18n( $comment_count ),
+				'<span>' . get_the_title() . '</span>'
 			);
-			the_comments_navigation( $args ); 
+		}
+		?>
+		</h2><!--. comments-title -->
+
+		<?php
+		$args = array(
+			'prev_text' => '<span class="icon-long-arrow-left"></span> ' . esc_html__( 'Older comments', 'siteorigin-corp' ),
+			'next_text' => esc_html__( 'Newer comments', 'siteorigin-corp' ) . ' <span class="icon-long-arrow-right"></span>',
+		);
+		the_comments_navigation( $args );
 		?>
 
 		<ol class="comment-list">
@@ -60,25 +60,23 @@
 					'callback' => 'siteorigin_corp_comment',
 					'short_ping' => true,
 				) );
-			?>
+		?>
 		</ol><!-- .comment-list -->
 
-		<?php 
-			$args = array(
-				'prev_text' => '<span class="icon-long-arrow-left"></span> ' . esc_html__( 'Older comments', 'siteorigin-corp' ),
-				'next_text' => esc_html__( 'Newer comments', 'siteorigin-corp' ) . ' <span class="icon-long-arrow-right"></span>',
-			);
-			the_comments_navigation( $args ); 
-
-	endif; // Check for have_comments().
-
+		<?php
+		$args = array(
+			'prev_text' => '<span class="icon-long-arrow-left"></span> ' . esc_html__( 'Older comments', 'siteorigin-corp' ),
+			'next_text' => esc_html__( 'Newer comments', 'siteorigin-corp' ) . ' <span class="icon-long-arrow-right"></span>',
+		);
+		the_comments_navigation( $args );
+	} // Check for have_comments().
 
 	// If comments are closed and there are comments, let's leave a little note, shall we?
-	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : ?>
+	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) { ?>
 
 		<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'siteorigin-corp' ); ?></p>
 	<?php
-	endif;
+	}
 
 	comment_form();
 	?>

diff --git a/footer.php b/footer.php
@@ -4,12 +4,10 @@
  *
  * Contains the closing of the #content div and all content after.
  *
- * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
+ * @see https://developer.wordpress.org/themes/basics/template-files/#template-partials
  *
- * @package siteorigin-corp
- * @license GPL 2.0 
+ * @license GPL 2.0
  */
-
 ?>
 
 		</div><!-- .corp-container -->
@@ -21,20 +19,20 @@
 
 		<?php do_action( 'siteorigin_corp_footer_top' ); ?>
 
-		<?php if ( siteorigin_page_setting( 'footer_widgets' ) ) : ?>
+		<?php if ( siteorigin_page_setting( 'footer_widgets' ) ) { ?>
 			<div class="corp-container">
 				<?php
-					if ( is_active_sidebar( 'sidebar-footer' ) ) {
-						$corp_sidebars = wp_get_sidebars_widgets();
-						?>
-						<div class="widgets widgets-<?php echo count( $corp_sidebars['sidebar-footer'] ) ?>" aria-label="<?php esc_attr_e( 'Footer Widgets', 'siteorigin-corp' ); ?>">
-							<?php dynamic_sidebar( 'sidebar-footer' ); ?>
-						</div>
-						<?php
-					}
+				if ( is_active_sidebar( 'sidebar-footer' ) ) {
+					$corp_sidebars = wp_get_sidebars_widgets();
+					?>
+					<div class="widgets widgets-<?php echo count( $corp_sidebars['sidebar-footer'] ); ?>" aria-label="<?php esc_attr_e( 'Footer Widgets', 'siteorigin-corp' ); ?>">
+						<?php dynamic_sidebar( 'sidebar-footer' ); ?>
+					</div>
+					<?php
+				}
 				?>
 			</div><!-- .corp-container -->
-		<?php endif; ?>
+		<?php } ?>
 
 		<div class="bottom-bar">
 			<div class="corp-container">
@@ -56,17 +54,18 @@
 					}
 					?>
 				</div><!-- .site-info -->
-				<?php 
-					$widget = siteorigin_setting( 'footer_social_widget' ); 
-					if ( has_nav_menu( 'menu-2' ) || ! empty( $widget['networks'] ) ) : ?>
+				<?php
+				$widget = siteorigin_setting( 'footer_social_widget' );
+
+				if ( has_nav_menu( 'menu-2' ) || ! empty( $widget['networks'] ) ) { ?>
 					<div class="footer-menu">
 						<?php wp_nav_menu( array( 'theme_location' => 'menu-2', 'depth' => 1, 'fallback_cb' => '' ) ); ?>
 						<?php if ( ! empty( $widget['networks'] ) && class_exists( 'SiteOrigin_Widget_SocialMediaButtons_Widget' ) ) {
 							the_widget( 'SiteOrigin_Widget_SocialMediaButtons_Widget', $widget );
-						} 
-					?>
+						}
+						?>
 					</div><!-- .footer-menu -->
-				<?php endif; ?>
+				<?php } ?>
 			</div><!-- .corp-container -->
 		</div><!-- .bottom-bar -->
 
@@ -75,12 +74,12 @@
 	</footer><!-- #colophon -->
 </div><!-- #page -->
 
-<?php if ( siteorigin_setting( 'navigation_scroll_to_top' ) ) : ?>
+<?php if ( siteorigin_setting( 'navigation_scroll_to_top' ) ) { ?>
 	<div id="scroll-to-top">
 		<span class="screen-reader-text"><?php esc_html_e( 'Scroll to top', 'siteorigin-corp' ); ?></span>
 		<?php siteorigin_corp_display_icon( 'up-arrow' ); ?>
 	</div>
-<?php endif; ?>
+<?php } ?>
 
 <?php wp_footer(); ?>
 <?php do_action( 'siteorigin_corp_footer_after' ); ?>