Plugin Directory

Changeset 2264706


Ignore:
Timestamp:
03/20/2020 06:56:28 PM (6 years ago)
Author:
thmarx
Message:

release 4.0.1

Location:
experience-manager/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • experience-manager/trunk/experience-manager.php

    r2264429 r2264706  
    1414}
    1515
    16 define("TMA_EXPERIENCE_MANAGER_VERSION", "4.0.0");
     16define("TMA_EXPERIENCE_MANAGER_VERSION", "4.0.1");
    1717define("TMA_EXPERIENCE_MANAGER_SEGMENT_MATCHING_ALL", "all");
    1818define("TMA_EXPERIENCE_MANAGER_SEGMENT_MATCHING_ANY", "any");
  • experience-manager/trunk/includes/tma_functions.php

    r2264429 r2264706  
    11<?php
    22
    3 function tma_exm_dependencies_fulfilled ($dependencies = []) {
     3function tma_exm_dependencies_fulfilled($dependencies = []) {
    44    $request = new \TMA\ExperienceManager\TMA_Request();
    55    return $request->check_installed_modules($dependencies);
    66}
    77
    8 function tma_exm_get_site () {
     8function tma_exm_get_site() {
    99    if (isset(get_option('tma_webtools_option')['webtools_siteid'])) {
    1010        return get_option('tma_webtools_option')['webtools_siteid'];
     
    1414
    1515function tma_exm_array_match_all($settings_segments, $user_segments) {
     16    if (!is_array($settings_segments) || !is_array($user_segments)) {
     17        return false;
     18    }
    1619    tma_exm_log("tma_exm_array_match_all");
    1720    tma_exm_log(json_encode($settings_segments));
     
    2023    $settings_segments = array_map('trim', $settings_segments);
    2124    $user_segments = array_map('trim', $user_segments);
    22     $attr_segments = array_map('intval', $attr_segments);
     25    $settings_segments = array_map('intval', $settings_segments);
    2326    $user_segments = array_map('intval', $user_segments);
    2427    return TMA\ExperienceManager\ShortCode_TMA_CONTENT::matching_mode_all($user_segments, $settings_segments);
     
    2629
    2730function tma_exm_array_match_any($settings_segments, $user_segments) {
     31    if (!is_array($settings_segments) || !is_array($user_segments)) {
     32        return false;
     33    }
    2834    tma_exm_log("tma_exm_array_match_all");
    2935    tma_exm_log(json_encode($settings_segments));
     
    3137    $settings_segments = array_map('trim', $settings_segments);
    3238    $user_segments = array_map('trim', $user_segments);
    33     $attr_segments = array_map('intval', $attr_segments);
     39    $settings_segments = array_map('intval', $settings_segments);
    3440    $user_segments = array_map('intval', $user_segments);
    3541    tma_exm_log(json_encode($user_segments));
    36    
     42
    3743    return TMA\ExperienceManager\ShortCode_TMA_CONTENT::matching_mode_any($user_segments, $settings_segments);
    3844}
     
    156162    return \TMA\ExperienceManager\Plugins::getInstance()->elementor() && class_exists('\Elementor\Plugin') && (\Elementor\Plugin::$instance->editor->is_edit_mode() || \Elementor\Plugin::$instance->preview->is_preview_mode());
    157163}
     164
    158165function tma_exm_beaver_is_preview() {
    159166    return \TMA\ExperienceManager\Plugins::getInstance()->beaver() && class_exists('\FLBuilderModel') && \FLBuilderModel::is_builder_active();
    160167}
     168
    161169function tma_exm_is_editor_active() {
    162170    if (isset($_GET['action']) && ($_GET['action'] === 'edit')) { // || $_GET['action'] === 'elementor')
     
    176184function tma_exm_is_frontend_mode_enabled() {
    177185    /*
    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      }
    184192     */
    185193    return true;
  • experience-manager/trunk/readme.txt

    r2264429 r2264706  
    44Requires at least: 4.4.1
    55Tested up to: 5.3.2
    6 Stable tag: 4.0.0
    7 Version: 4.0.0
     6Stable tag: 4.0.1
     7Version: 4.0.1
    88License: GPLv2 or later
    99
     
    6767== Changelog ==
    6868
     694.0.1
     70 * Fixed a type in a variable name
     71
    69724.0.0
    7073 * New json based segment definition language introduced
Note: See TracChangeset for help on using the changeset viewer.