Changeset 2264706
- Timestamp:
- 03/20/2020 06:56:28 PM (6 years ago)
- Location:
- experience-manager/trunk
- Files:
-
- 3 edited
-
experience-manager.php (modified) (1 diff)
-
includes/tma_functions.php (modified) (7 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
experience-manager/trunk/experience-manager.php
r2264429 r2264706 14 14 } 15 15 16 define("TMA_EXPERIENCE_MANAGER_VERSION", "4.0. 0");16 define("TMA_EXPERIENCE_MANAGER_VERSION", "4.0.1"); 17 17 define("TMA_EXPERIENCE_MANAGER_SEGMENT_MATCHING_ALL", "all"); 18 18 define("TMA_EXPERIENCE_MANAGER_SEGMENT_MATCHING_ANY", "any"); -
experience-manager/trunk/includes/tma_functions.php
r2264429 r2264706 1 1 <?php 2 2 3 function tma_exm_dependencies_fulfilled ($dependencies = []) {3 function tma_exm_dependencies_fulfilled($dependencies = []) { 4 4 $request = new \TMA\ExperienceManager\TMA_Request(); 5 5 return $request->check_installed_modules($dependencies); 6 6 } 7 7 8 function tma_exm_get_site () {8 function tma_exm_get_site() { 9 9 if (isset(get_option('tma_webtools_option')['webtools_siteid'])) { 10 10 return get_option('tma_webtools_option')['webtools_siteid']; … … 14 14 15 15 function tma_exm_array_match_all($settings_segments, $user_segments) { 16 if (!is_array($settings_segments) || !is_array($user_segments)) { 17 return false; 18 } 16 19 tma_exm_log("tma_exm_array_match_all"); 17 20 tma_exm_log(json_encode($settings_segments)); … … 20 23 $settings_segments = array_map('trim', $settings_segments); 21 24 $user_segments = array_map('trim', $user_segments); 22 $ attr_segments = array_map('intval', $attr_segments);25 $settings_segments = array_map('intval', $settings_segments); 23 26 $user_segments = array_map('intval', $user_segments); 24 27 return TMA\ExperienceManager\ShortCode_TMA_CONTENT::matching_mode_all($user_segments, $settings_segments); … … 26 29 27 30 function tma_exm_array_match_any($settings_segments, $user_segments) { 31 if (!is_array($settings_segments) || !is_array($user_segments)) { 32 return false; 33 } 28 34 tma_exm_log("tma_exm_array_match_all"); 29 35 tma_exm_log(json_encode($settings_segments)); … … 31 37 $settings_segments = array_map('trim', $settings_segments); 32 38 $user_segments = array_map('trim', $user_segments); 33 $ attr_segments = array_map('intval', $attr_segments);39 $settings_segments = array_map('intval', $settings_segments); 34 40 $user_segments = array_map('intval', $user_segments); 35 41 tma_exm_log(json_encode($user_segments)); 36 42 37 43 return TMA\ExperienceManager\ShortCode_TMA_CONTENT::matching_mode_any($user_segments, $settings_segments); 38 44 } … … 156 162 return \TMA\ExperienceManager\Plugins::getInstance()->elementor() && class_exists('\Elementor\Plugin') && (\Elementor\Plugin::$instance->editor->is_edit_mode() || \Elementor\Plugin::$instance->preview->is_preview_mode()); 157 163 } 164 158 165 function tma_exm_beaver_is_preview() { 159 166 return \TMA\ExperienceManager\Plugins::getInstance()->beaver() && class_exists('\FLBuilderModel') && \FLBuilderModel::is_builder_active(); 160 167 } 168 161 169 function tma_exm_is_editor_active() { 162 170 if (isset($_GET['action']) && ($_GET['action'] === 'edit')) { // || $_GET['action'] === 'elementor') … … 176 184 function tma_exm_is_frontend_mode_enabled() { 177 185 /* 178 $options = get_option('tma_webtools_option_targeting');179 if ($options !== false && is_array($options) && array_key_exists("webtools_backend_mode", $options)) {180 return !$options['webtools_backend_mode'] === "on";181 } else {182 return true;183 }186 $options = get_option('tma_webtools_option_targeting'); 187 if ($options !== false && is_array($options) && array_key_exists("webtools_backend_mode", $options)) { 188 return !$options['webtools_backend_mode'] === "on"; 189 } else { 190 return true; 191 } 184 192 */ 185 193 return true; -
experience-manager/trunk/readme.txt
r2264429 r2264706 4 4 Requires at least: 4.4.1 5 5 Tested up to: 5.3.2 6 Stable tag: 4.0. 07 Version: 4.0. 06 Stable tag: 4.0.1 7 Version: 4.0.1 8 8 License: GPLv2 or later 9 9 … … 67 67 == Changelog == 68 68 69 4.0.1 70 * Fixed a type in a variable name 71 69 72 4.0.0 70 73 * New json based segment definition language introduced
Note: See TracChangeset
for help on using the changeset viewer.