WordPress.org

Plugin Directory

Changeset 1571585


Ignore:
Timestamp:
01/10/17 02:02:38 (6 months ago)
Author:
dancameron
Message:

Deploy version 12.0.2

Location:
sprout-invoices
Files:
590 added
7 edited

Legend:

Unmodified
Added
Removed
  • sprout-invoices/trunk/Sprout_Invoices.class.php

    r1554108 r1571585  
    3333     * Current version. Should match sprout-invoices.php plugin version. 
    3434     */ 
    35     const SI_VERSION = '12.0.1'; 
     35    const SI_VERSION = '12.0.2'; 
    3636    /** 
    3737     * DB Version 
  • sprout-invoices/trunk/changelog.txt

    r1554108 r1571585  
     1= 12.0.2 = 
     2 
     3* FIX: Select2 Compat issues with themes and other plugins 
     4 
    15= 12.0.1 = 
    26 
  • sprout-invoices/trunk/controllers/_Controller.php

    r1547674 r1571585  
    974974 
    975975    public static function get_user_ip() { 
    976         $client  = @$_SERVER['HTTP_CLIENT_IP']; 
    977         $forward = @$_SERVER['HTTP_X_FORWARDED_FOR']; 
    978         $remote  = $_SERVER['REMOTE_ADDR']; 
    979  
    980         if ( filter_var( $client, FILTER_VALIDATE_IP ) ) { 
    981             $ip = $client; 
    982         } elseif ( filter_var( $forward, FILTER_VALIDATE_IP ) ) { 
    983             $ip = $forward; 
    984         } else { 
    985             $ip = $remote; 
    986         } 
    987         return $ip; 
     976        $client  = @$_SERVER['HTTP_CLIENT_IP']; 
     977        $forward = @$_SERVER['HTTP_X_FORWARDED_FOR']; 
     978        $remote  = $_SERVER['REMOTE_ADDR']; 
     979 
     980        $ip = ''; 
     981        if ( filter_var( $client, FILTER_VALIDATE_IP ) ) { 
     982            $ip = $client; 
     983        } elseif ( filter_var( $forward, FILTER_VALIDATE_IP ) ) { 
     984            $ip = $forward; 
     985        } elseif ( filter_var( $remote, FILTER_VALIDATE_IP ) ) { 
     986            $ip = $remote; 
     987        } 
     988        return $ip; 
    988989    } 
    989990 
  • sprout-invoices/trunk/controllers/compat/Compatibility.php

    r1554108 r1571585  
    1010 
    1111    public static function init() { 
    12         // attempt to fill all select2 registrations on si_admin pages 
     12        // attempt to kill all select2 registrations on si_admin pages 
    1313        add_action( 'init', array( __CLASS__, 'deregister_select2' ), PHP_INT_MAX ); 
     14        // atttempt to kill all select2 registrations on si_admin pages REALLY LATE 
     15        add_action( 'wp_print_scripts', array( __CLASS__, 'deenqueue_select2' ), PHP_INT_MAX ); 
    1416 
    1517        // WP SEO 
     
    5355            wp_deregister_script( 'select2' ); 
    5456            wp_deregister_style( 'select2' ); 
     57            // Register the SI version with the old handle 
     58            wp_register_style( 'select2', SI_URL . '/resources/admin/plugins/select2/css/select2.min.css', null, self::SI_VERSION, false ); 
     59            wp_register_script( 'select2', SI_URL . '/resources/admin/plugins/select2/js/select2.min.js', array( 'jquery' ), self::SI_VERSION, false ); 
     60        } 
     61    } 
     62 
     63    public static function deenqueue_select2() { 
     64        if ( self::is_si_admin() ) { 
     65            foreach ( wp_scripts()->queue as $handle ) { 
     66                if ( strpos( $handle, 'select2' ) !== false && 'select2_4.0' !== $handle ) { 
     67                    wp_dequeue_script( $handle ); 
     68                    // Register the SI version with the old handle 
     69                    wp_enqueue_script( $handle, SI_URL . '/resources/admin/plugins/select2/js/select2.min.js', array( 'jquery' ), self::SI_VERSION, false ); 
     70 
     71                } 
     72            } 
     73 
     74            foreach ( wp_styles()->queue as $handle ) { 
     75                if ( strpos( $handle, 'select2' ) !== false && 'select2_4.0_css' !== $handle ) { 
     76                    wp_dequeue_style( $handle ); 
     77                    wp_enqueue_style( $handle, SI_URL . '/resources/admin/plugins/select2/css/select2.min.css', null, self::SI_VERSION, false ); 
     78                } 
     79            } 
    5580        } 
    5681    } 
  • sprout-invoices/trunk/controllers/notifications/Notifications_Control.php

    r1550009 r1571585  
    683683        if ( ! is_a( $user, 'WP_User' ) ) { 
    684684            do_action( 'si_error', __CLASS__ . '::' . __FUNCTION__ . ' - Get User Email FAILED', $user ); 
    685             wpbt(); 
    686685            return false; 
    687686        } 
  • sprout-invoices/trunk/readme.txt

    r1554108 r1571585  
    55Requires at least: 3.8 
    66Tested up to: 4.7 
    7 Stable tag: 12.0.1 
     7Stable tag: 12.0.2 
    88License: GPLv2 or later 
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html 
     
    125125 
    126126== Changelog == 
     127 
     128= 12.0.2 = 
     129 
     130* FIX: Select2 Compat issues with themes and other plugins 
    127131 
    128132= 12.0.1 = 
  • sprout-invoices/trunk/sprout-invoices.php

    r1554108 r1571585  
    33/** 
    44 * @package Sprout_Invoices 
    5  * @version 12.0.1 
     5 * @version 12.0.2 
    66 */ 
    77 
     
    1111 * Description: App allows for any WordPress site to accept estimates, create invoices and receive invoice payments. Learn more at <a href="https://sproutapps.co">Sprout Apps</a>. 
    1212 * Author: Sprout Apps 
    13  * Version: 12.0.1 
     13 * Version: 12.0.2 
    1414 * Author URI: https://sproutapps.co 
    1515 * Text Domain: sprout-invoices 
Note: See TracChangeset for help on using the changeset viewer.