From ffd24bcf104a99436b2dd2f1a2f7a354282c0406 Mon Sep 17 00:00:00 2001 From: GITUSER Date: Wed, 16 Mar 2016 19:02:54 -0500 Subject: [PATCH] Committing uncommitted changes --- .../classes/class.post-type.landing-page.php | 16 ++++++++++------ inbound-pro.php | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/landing-pages/classes/class.post-type.landing-page.php b/core/landing-pages/classes/class.post-type.landing-page.php index d8caab31..5810dca0 100644 --- a/core/landing-pages/classes/class.post-type.landing-page.php +++ b/core/landing-pages/classes/class.post-type.landing-page.php @@ -324,9 +324,15 @@ public static function show_aggregated_stats($type_of_stat) { * Adds rewrite rules */ public static function add_rewrite_rules() { - $this_path = LANDINGPAGES_PATH; - $this_path = explode('wp-content', $this_path); - $this_path = "wp-content" . $this_path[1]; + if ( !class_exists('Inbound_Pro_Plugin')){ + $this_path = LANDINGPAGES_PATH; + $this_path = explode('wp-content', $this_path); + $this_path = "wp-content" . $this_path[1]; + } else { + $this_path = INBOUND_PRO_PATH; + $this_path = explode('wp-content', $this_path); + $this_path = "wp-content" . $this_path[1] . "core/landing-pages/"; + } $slug = get_option('lp-main-landing-page-permalink-prefix', 'go'); /*echo $slug;exit; */ @@ -358,9 +364,7 @@ public static function filter_rewrite_rules( $rules ) { /* print_r($rules_array);exit; */ - $this_path = LANDINGPAGES_PATH; - $this_path = explode('wp-content', $this_path); - $this_path = "wp-content" . $this_path[1]; + $slug = get_option('lp-main-landing-page-permalink-prefix', 'go'); $i = 0; diff --git a/inbound-pro.php b/inbound-pro.php index 2012c4bd..a6d44d05 100644 --- a/inbound-pro.php +++ b/inbound-pro.php @@ -5,7 +5,7 @@ Description: Inbound Marketing Suite for WordPress Author: Inbound Now Author: Inbound Now -Version: 1.4.2 +Version: 1.4.3 Author URI: http://www.inboundnow.com/ Text Domain: inbound-pro Domain Path: /lang/ @@ -96,7 +96,7 @@ public function __construct() { */ private static function define_constants() { - define('INBOUND_PRO_CURRENT_VERSION', '1.4.2' ); + define('INBOUND_PRO_CURRENT_VERSION', '1.4.3' ); define('INBOUND_PRO_URLPATH', WP_PLUGIN_URL.'/'.plugin_basename( dirname(__FILE__) ).'/' ); define('INBOUND_PRO_PATH', WP_PLUGIN_DIR.'/'.plugin_basename( dirname(__FILE__) ).'/' ); define('INBOUND_PRO_SLUG', plugin_basename( dirname(__FILE__) ) );