Changeset 1848493

Timestamp:

03/28/2018 12:30:05 PM (8 years ago)

Author:

themeblvd

Message:

1.0.5

Location:

theme-blvd-layouts-to-posts/trunk

Files:

• readme.txt (modified) (2 diffs)
• tb-layouts-to-posts.php (modified) (15 diffs)

theme-blvd-layouts-to-posts/trunk/readme.txt

@@ -3 +3 @@
 Contributors: themeblvd
 Tags: layout builder, builder, custom layouts, themeblvd, theme blvd, jason bobich
-Stable Tag: 1.0.4
+Stable Tag: 1.0.5
+Tested up to: 4.9
 
 This plugin extends the Theme Blvd Layout Builder so you can assign your custom templates to standard posts and custom post types.
@@ -35 +36 @@
 == Changelog ==
 
+= 1.0.5 - 03/28/2018 =
+
+* Fixed: Password-protected posts display custom layout before password is entered (for Theme Blvd framework 2.7+ themes).
+* Fixed: Styling of meta box was a bit wonky (for Theme Blvd framework 2.7+ themes).
+
 = 1.0.4 - 05/21/2015 =
 

theme-blvd-layouts-to-posts/trunk/tb-layouts-to-posts.php

@@ -3 +3 @@
 Plugin Name: Theme Blvd Layouts to Posts
 Description: This plugin extends the Theme Blvd Layout Builder to allow you to assign your custom layouts to standard posts and custom post types.
-Version: 1.0.4
+Version: 1.0.5
 Author: Jason Bobich
 Author URI: http://jasonbobich.com
@@ -26 +26 @@
 */
 
-define( 'TB_LTP_PLUGIN_VERSION', '1.0.4' );
+define( 'TB_LTP_PLUGIN_VERSION', '1.0.5' );
 define( 'TB_LTP_PLUGIN_DIR', dirname( __FILE__ ) );
 define( 'TB_LTP_PLUGIN_URI', plugins_url( '' , __FILE__ ) );
@@ -38 +38 @@
 
     // Check to make sure Theme Blvd Framework is running
-    if( ! defined( 'TB_FRAMEWORK_VERSION' ) || ! defined( 'TB_BUILDER_PLUGIN_VERSION' ) ) {
+    if ( ! defined( 'TB_FRAMEWORK_VERSION' ) || ! defined( 'TB_BUILDER_PLUGIN_VERSION' ) ) {
         add_action( 'admin_notices', 'themeblvd_ltp_notice' );
         add_action( 'admin_init', 'themeblvd_ltp_disable_nag' );
@@ -56 +56 @@
     // Also, if there was a custom layout assigned with our option,
     // we need to redirect to the template_builder.php file.
-    add_action( 'template_redirect', 'themeblvd_ltp_redirect' );
+    add_action( 'template_include', 'themeblvd_ltp_redirect' );
 
 }
@@ -125 +125 @@
     $url = admin_url( $pagenow );
 
-    if( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+    if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
         $url .= sprintf( '?%s&nag-ignore=%s', $_SERVER['QUERY_STRING'], 'tb-nag-'.$id );
     } else {
@@ -172 +172 @@
     $layouts = get_posts('post_type=tb_layout&orderby=title&order=ASC&numberposts=-1');
 
-    if( $layouts ) {
+    if ( $layouts ) {
 
         $select = array( '' => '-- '.__( 'None', 'theme-blvd-layouts-to-posts' ).' --' );
@@ -182 +182 @@
 
     $options = array(
-        array(
-            'id'    => '_tb_placeholder',
-            'std'   => 1,
-            'type'  => 'hidden'
-        ),
         array(
             'id'        => '_tb_custom_layout',
@@ -195 +190 @@
     );
 
-    if ( version_compare(TB_FRAMEWORK_VERSION, '2.5.0', '<') ) {
-        unset($options[0]);
-    }
-
-    // Start output
-    echo '<div id="optionsframework" class="tb-meta-box side">';
+    // Start output.
+    // Note: #optionsframework ID needed prior to framewor 2.7.
+    // Note: .tb-options-wrap class needed in framework 2.7+.
+    echo '<div id="optionsframework" class="tb-meta-box tb-options-wrap side">';
 
     // Display options form
@@ -213 +206 @@
         echo $form[0];
 
-    } else if( function_exists( 'optionsframework_fields' ) ) {
+    } elseif ( function_exists( 'optionsframework_fields' ) ) {
 
         // Options form for TB framework v2.0 - v2.1
@@ -266 +259 @@
 
     // If any single post type
-    if( is_single() ) {
+    if ( is_single() ) {
 
         // Get layout name if its been saved to this post.
@@ -272 +265 @@
 
         // Only continue if a custom layout was selected
-        if( $layout_name ) {
+        if ( $layout_name ) {
 
             if ( post_password_required() || ( 'private' == get_post_status() && ! current_user_can( 'edit_posts' ) ) ) {
@@ -286 +279 @@
                 $config['builder_post_id'] = themeblvd_post_id_by_name( $layout_name, 'tb_layout' ); // Needed in framework v2.2.1+
 
+                $config['sidebar_layout'] = 'full_width';
+
                 if ( $config['builder_post_id'] && version_compare(TB_FRAMEWORK_VERSION, '2.5.0', '<') ) {
 
@@ -314 +309 @@
                     $config['sidebar_layout'] = $layout_settings['sidebar_layout'];
 
-                    if( 'default' == $config['sidebar_layout'] ) {
+                    if ( 'default' == $config['sidebar_layout'] ) {
                         $config['sidebar_layout'] = themeblvd_get_option( 'sidebar_layout', null, apply_filters( 'themeblvd_default_sidebar_layout', 'sidebar_right' ) );
                     }
@@ -328 +323 @@
 
     }
+
     return $config;
 }
@@ -342 +338 @@
  * @since 1.0.0
  */
-function themeblvd_ltp_redirect( $config ) {
-    // Include page template and exit if this is a
-    // single post AND the global config says there
-    // is a custom layout
-    if( is_single() && themeblvd_config( 'builder' ) ) {
-        include_once( locate_template( 'template_builder.php' ) );
-        exit;
-    }
-}
+function themeblvd_ltp_redirect( $template ) {
+
+    // If post is password-protected, allow to
+    // use single.php so that the password forms
+    // shows instead of the custom layout.
+    if ( post_password_required() ) {
+
+        return $template;
+
+    }
+
+    // If this is a single post with a template applied,
+    // use the template_builder.php page template instead.
+    if ( is_single() && themeblvd_config( 'builder' ) ) {
+
+        return locate_template( 'template_builder.php' );
+
+    }
+
+    return $template;
+
+}