@@ -77,8 +77,8 @@ function generate_settings_page() {
*
* @since 2.0
*/
- do_action( 'generate_dashboard_inside_container' );
- ?>
+ do_action( 'generate_dashboard_inside_container' );
+ ?>
diff --git a/inc/defaults.php b/inc/defaults.php
index f910069e..c8d8c9fa 100644
--- a/inc/defaults.php
+++ b/inc/defaults.php
@@ -38,7 +38,7 @@ function generate_get_defaults() {
'layout_setting' => 'right-sidebar',
'blog_layout_setting' => 'right-sidebar',
'single_layout_setting' => 'right-sidebar',
- 'post_content' => 'full',
+ 'post_content' => 'excerpt',
'footer_layout_setting' => 'fluid-footer',
'footer_inner_width' => 'contained',
'footer_widget_setting' => '3',
@@ -72,7 +72,7 @@ function generate_get_color_defaults() {
'header_link_color' => '#3a3a3a',
'header_link_hover_color' => '',
'site_title_color' => '#222222',
- 'site_tagline_color' => '#999999',
+ 'site_tagline_color' => '#757575',
'navigation_background_color' => '#222222',
'navigation_text_color' => '#ffffff',
'navigation_background_hover_color' => '#3f3f3f',
@@ -92,8 +92,8 @@ function generate_get_color_defaults() {
'content_title_color' => '',
'blog_post_title_color' => '',
'blog_post_title_hover_color' => '',
- 'entry_meta_text_color' => '#888888',
- 'entry_meta_link_color' => '#666666',
+ 'entry_meta_text_color' => '#595959',
+ 'entry_meta_link_color' => '#595959',
'entry_meta_link_color_hover' => '#1e73be',
'h1_color' => '',
'h2_color' => '',
@@ -332,7 +332,7 @@ function generate_typography_default_fonts() {
'Segoe UI, Helvetica Neue, Helvetica, sans-serif',
'Tahoma, Geneva, sans-serif',
'Trebuchet MS, Helvetica, sans-serif',
- 'Verdana, Geneva, sans-serif'
+ 'Verdana, Geneva, sans-serif',
);
return apply_filters( 'generate_typography_default_fonts', $fonts );
diff --git a/inc/deprecated.php b/inc/deprecated.php
index 0740ab1e..8472c744 100644
--- a/inc/deprecated.php
+++ b/inc/deprecated.php
@@ -20,7 +20,7 @@
* @deprecated 1.3.45
*/
function generate_paging_nav() {
- _deprecated_function( __FUNCTION__, '1.3.45', "the_posts_navigation()" );
+ _deprecated_function( __FUNCTION__, '1.3.45', 'the_posts_navigation()' );
if ( function_exists( 'the_posts_pagination' ) ) {
the_posts_pagination( array(
'mid_size' => apply_filters( 'generate_pagination_mid_size', 1 ),
@@ -90,96 +90,96 @@ function generate_get_min_suffix() {
if ( ! function_exists( 'generate_add_layout_meta_box' ) ) {
function generate_add_layout_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_register_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_register_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_show_layout_meta_box' ) ) {
function generate_show_layout_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_do_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_do_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_save_layout_meta' ) ) {
function generate_save_layout_meta() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_save_layout_meta_data()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_save_layout_meta_data()' );
}
}
if ( ! function_exists( 'generate_add_footer_widget_meta_box' ) ) {
function generate_add_footer_widget_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_register_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_register_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_show_footer_widget_meta_box' ) ) {
function generate_show_footer_widget_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_do_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_do_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_save_footer_widget_meta' ) ) {
function generate_save_footer_widget_meta() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_save_layout_meta_data()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_save_layout_meta_data()' );
}
}
if ( ! function_exists( 'generate_add_page_builder_meta_box' ) ) {
function generate_add_page_builder_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_register_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_register_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_show_page_builder_meta_box' ) ) {
function generate_show_page_builder_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_do_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_do_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_save_page_builder_meta' ) ) {
function generate_save_page_builder_meta() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_save_layout_meta_data()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_save_layout_meta_data()' );
}
}
if ( ! function_exists( 'generate_add_de_meta_box' ) ) {
function generate_add_de_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_register_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_register_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_show_de_meta_box' ) ) {
function generate_show_de_meta_box() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_do_layout_meta_box()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_do_layout_meta_box()' );
}
}
if ( ! function_exists( 'generate_save_de_meta' ) ) {
function generate_save_de_meta() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_save_layout_meta_data()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_save_layout_meta_data()' );
}
}
if ( ! function_exists( 'generate_add_base_inline_css' ) ) {
function generate_add_base_inline_css() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_enqueue_dynamic_css()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_enqueue_dynamic_css()' );
}
}
if ( ! function_exists( 'generate_color_scripts' ) ) {
function generate_color_scripts() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_enqueue_dynamic_css()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_enqueue_dynamic_css()' );
}
}
if ( ! function_exists( 'generate_typography_scripts' ) ) {
function generate_typography_scripts() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_enqueue_dynamic_css()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_enqueue_dynamic_css()' );
}
}
if ( ! function_exists( 'generate_spacing_scripts' ) ) {
function generate_spacing_scripts() {
- _deprecated_function( __FUNCTION__, '2.0', "generate_enqueue_dynamic_css()" );
+ _deprecated_function( __FUNCTION__, '2.0', 'generate_enqueue_dynamic_css()' );
}
}
diff --git a/inc/general.php b/inc/general.php
index 30144cfe..3de53364 100644
--- a/inc/general.php
+++ b/inc/general.php
@@ -43,7 +43,7 @@ function generate_scripts() {
wp_enqueue_script( 'generate-menu', $dir_uri . "/js/menu{$suffix}.js", array(), GENERATE_VERSION, true );
wp_enqueue_script( 'generate-a11y', $dir_uri . "/js/a11y{$suffix}.js", array(), GENERATE_VERSION, true );
- if ( 'click' == $generate_settings[ 'nav_dropdown_type' ] || 'click-arrow' == $generate_settings[ 'nav_dropdown_type' ] ) {
+ if ( 'click' == $generate_settings['nav_dropdown_type'] || 'click-arrow' == $generate_settings['nav_dropdown_type'] ) {
wp_enqueue_script( 'generate-dropdown-click', $dir_uri . "/js/dropdown-click{$suffix}.js", array( 'generate-menu' ), GENERATE_VERSION, true );
}
diff --git a/inc/markup.php b/inc/markup.php
index 796761f7..e449b688 100644
--- a/inc/markup.php
+++ b/inc/markup.php
@@ -118,10 +118,10 @@ function generate_body_classes( $classes ) {
}
// Navigation dropdown type
- if ( 'click' == $generate_settings[ 'nav_dropdown_type' ] ) {
+ if ( 'click' == $generate_settings['nav_dropdown_type'] ) {
$classes[] = 'dropdown-click';
$classes[] = 'dropdown-click-menu-item';
- } elseif ( 'click-arrow' == $generate_settings[ 'nav_dropdown_type' ] ) {
+ } elseif ( 'click-arrow' == $generate_settings['nav_dropdown_type'] ) {
$classes[] = 'dropdown-click-arrow';
$classes[] = 'dropdown-click';
} else {
@@ -435,7 +435,7 @@ function generate_footer_classes( $classes ) {
// Footer bar
$classes[] = ( is_active_sidebar( 'footer-bar' ) ) ? 'footer-bar-active' : '';
- $classes[] = ( is_active_sidebar( 'footer-bar' ) ) ? 'footer-bar-align-' . $generate_settings[ 'footer_bar_alignment' ] : '';
+ $classes[] = ( is_active_sidebar( 'footer-bar' ) ) ? 'footer-bar-align-' . $generate_settings['footer_bar_alignment'] : '';
return $classes;
}
diff --git a/inc/meta-box.php b/inc/meta-box.php
index fcdefe8d..e1fc9ea7 100644
--- a/inc/meta-box.php
+++ b/inc/meta-box.php
@@ -261,7 +261,7 @@ function generate_do_layout_meta_box( $post ) {
function generate_save_layout_meta_data( $post_id ) {
$is_autosave = wp_is_post_autosave( $post_id );
$is_revision = wp_is_post_revision( $post_id );
- $is_valid_nonce = ( isset( $_POST[ 'generate_layout_nonce' ] ) && wp_verify_nonce( sanitize_key( $_POST[ 'generate_layout_nonce' ] ), basename( __FILE__ ) ) ) ? true : false;
+ $is_valid_nonce = ( isset( $_POST['generate_layout_nonce'] ) && wp_verify_nonce( sanitize_key( $_POST['generate_layout_nonce'] ), basename( __FILE__ ) ) ) ? true : false;
if ( $is_autosave || $is_revision || ! $is_valid_nonce ) {
return;
diff --git a/inc/migrate.php b/inc/migrate.php
index 5c23d36d..918e883f 100644
--- a/inc/migrate.php
+++ b/inc/migrate.php
@@ -72,7 +72,7 @@ function generate_update_logo_setting() {
// Got our custom logo? Time to delete the old value
if ( get_theme_mod( 'custom_logo' ) ) {
- $new_settings[ 'logo' ] = '';
+ $new_settings['logo'] = '';
$update_settings = wp_parse_args( $new_settings, $generate_settings );
update_option( 'generate_settings', $update_settings );
}
@@ -104,7 +104,7 @@ function generate_typography_convert_values() {
);
// Get our body font family setting
- $value = $generate_settings[ 'font_body' ];
+ $value = $generate_settings['font_body'];
// Create a new, empty array
$new_settings = array();
@@ -116,7 +116,7 @@ function generate_typography_convert_values() {
$value = current( explode( ':', $value ) );
// Populate our new array with our new, clean value
- $new_settings[ 'font_body' ] = $value;
+ $new_settings['font_body'] = $value;
}
@@ -152,12 +152,12 @@ function generate_typography_set_font_data() {
);
// We don't need to do this if we're using the default font, as these values have defaults already
- if ( $defaults[ 'font_body' ] == $generate_settings[ 'font_body' ] ) {
+ if ( $defaults['font_body'] == $generate_settings['font_body'] ) {
return;
}
// Don't need to continue if we're using a system font or our default font
- if ( in_array( $generate_settings[ 'font_body' ], generate_typography_default_fonts() ) ) {
+ if ( in_array( $generate_settings['font_body'], generate_typography_default_fonts() ) ) {
return;
}
@@ -170,7 +170,7 @@ function generate_typography_set_font_data() {
$fonts = generate_get_all_google_fonts();
// Get the ID from our font
- $id = strtolower( str_replace( ' ', '_', $generate_settings[ 'font_body' ] ) );
+ $id = strtolower( str_replace( ' ', '_', $generate_settings['font_body'] ) );
// If the ID doesn't exist within our fonts, we can bail
if ( ! array_key_exists( $id, $fonts ) ) {
@@ -245,12 +245,12 @@ function generate_migrate_existing_settings() {
// Turn on the full Font Awesome library for existing websites.
if ( ! isset( $migration_settings['font_awesome_essentials_updated'] ) || 'true' !== $migration_settings['font_awesome_essentials_updated'] ) {
- $new_settings[ 'font_awesome_essentials' ] = false;
+ $new_settings['font_awesome_essentials'] = false;
}
// Turn off dynamic CSS caching for existing websites.
if ( ! isset( $migration_settings['skip_dynamic_css_cache'] ) || 'true' !== $migration_settings['skip_dynamic_css_cache'] ) {
- $new_settings[ 'dynamic_css_cache' ] = false;
+ $new_settings['dynamic_css_cache'] = false;
}
// Set our font family to Open Sans if we never saved a different font.
@@ -266,12 +266,26 @@ function generate_migrate_existing_settings() {
$variants = get_theme_mod( 'font_body_variants', '300,300italic,regular,italic,600,600italic,700,700italic,800,800italic' );
if ( 'Open Sans' == $generate_settings['font_body'] ) {
- $new_settings[ 'font_body' ] = 'Open Sans';
+ $new_settings['font_body'] = 'Open Sans';
set_theme_mod( 'font_body_category', $category );
set_theme_mod( 'font_body_variants', $variants );
}
}
+ // Set blog post content to full content if it hasn't been set otherwise.
+ if ( ! isset( $migration_settings['blog_post_content_preview'] ) || 'true' !== $migration_settings['blog_post_content_preview'] ) {
+ $generate_settings = wp_parse_args(
+ get_option( 'generate_settings', array() ),
+ array(
+ 'post_content' => 'full',
+ )
+ );
+
+ if ( 'full' === $generate_settings['post_content'] ) {
+ $new_settings['post_content'] = 'full';
+ }
+ }
+
}
// Set our flags.
@@ -287,6 +301,10 @@ function generate_migrate_existing_settings() {
$migrated_flags['default_font_updated'] = 'true';
}
+ if ( ! isset( $migration_settings['blog_post_content_preview'] ) || 'true' !== $migration_settings['blog_post_content_preview'] ) {
+ $migrated_flags['blog_post_content_preview'] = 'true';
+ }
+
// Merge our new settings with our existing settings.
if ( ! empty( $new_settings ) ) {
$update_settings = wp_parse_args( $new_settings, $settings );
diff --git a/inc/plugin-compat.php b/inc/plugin-compat.php
index 81a7ee64..48a0bb85 100644
--- a/inc/plugin-compat.php
+++ b/inc/plugin-compat.php
@@ -39,7 +39,8 @@ function generate_setup_woocommerce() {
*
* @since 1.3.22
*/
- function generate_woocommerce_start() { ?>
+ function generate_woocommerce_start() {
+ ?>
>
>
*
* @since 1.3.22
*/
- function generate_woocommerce_end() { ?>
+ function generate_woocommerce_end() {
+ ?>
post_date );
if ( $post_date < $compare_date ) {
$css = '.fl-builder.no-sidebar .container.grid-container {
@@ -249,7 +251,7 @@ function generate_beaver_builder_css() {
.fl-builder.one-container.no-sidebar .site-content {
padding:0;
}';
- $css = str_replace(array("\r", "\n", "\t"), '', $css);
+ $css = str_replace( array( "\r", "\n", "\t" ), '', $css );
wp_add_inline_style( 'generate-style', $css );
}
}
diff --git a/inc/structure/archives.php b/inc/structure/archives.php
index c5af09cc..3c5b212f 100644
--- a/inc/structure/archives.php
+++ b/inc/structure/archives.php
@@ -20,8 +20,10 @@ function generate_archive_title() {
if ( ! function_exists( 'the_archive_title' ) ) {
return;
}
+
+ $clearfix = is_author() ? ' clearfix' : '';
?>
-