WordPress.org
Get WordPress

Plugin Directory

Changeset 867417


Ignore:
Timestamp:
03/01/2014 08:58:43 AM (12 years ago)
Author:
shockware
Message:

Merge branch 'master' into HEAD

Location:
contact-form-7-datepicker/trunk
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • contact-form-7-datepicker/trunk/admin.php

    r801560 r867417  
    175175
    176176    private static function is_wpcf7_page() {
    177         global $current_screen;
     177        global $current_screen, $pagenow;
    178178
    179         if (is_object($current_screen) && 'toplevel_page_wpcf7' == $current_screen->id)
     179        if (is_object($current_screen) && strpos($current_screen->id, 'page_wpcf7'))
    180180            return true;
    181181

  • contact-form-7-datepicker/trunk/contact-form-7-datepicker.php

    r820497 r867417  
    55Description: Easily add a date field using jQuery UI's datepicker to your CF7 forms. This plugin depends on Contact Form 7.
    66Author: Aurel Canciu
    7 Version: 2.4.3
     7Version: 2.4.4
    88Author URI: https://github.com/relu/
    99*/

  • contact-form-7-datepicker/trunk/modules/date.php

    r820500 r867417  
    2020
    2121        // Tag generator
     22        add_action('load-contact_page_wpcf7-new', array(__CLASS__, 'tag_generator'));
    2223        add_action('load-toplevel_page_wpcf7', array(__CLASS__, 'tag_generator'));
    2324
    … …  
    130131
    131132    public static function tag_generator() {
     133        if (! function_exists( 'wpcf7_add_tag_generator'))
     134            return;
     135
    132136        wpcf7_add_tag_generator('date',
    133137            __('Date field', 'wpcf7'),

  • contact-form-7-datepicker/trunk/modules/datetime.php

    r820500 r867417  
    1414
    1515        // Tag generator
     16        add_action('load-contact_page_wpcf7-new', array(__CLASS__, 'tag_generator'));
    1617        add_action('load-toplevel_page_wpcf7', array(__CLASS__, 'tag_generator'));
    1718
    … …  
    135136
    136137    public static function tag_generator() {
     138        if (! function_exists( 'wpcf7_add_tag_generator'))
     139            return;
     140
    137141        wpcf7_add_tag_generator('datetime',
    138142            __('Date Time field', 'wpcf7'),

  • contact-form-7-datepicker/trunk/modules/time.php

    r820500 r867417  
    1515
    1616        // Tag generator
     17        add_action('load-contact_page_wpcf7-new', array(__CLASS__, 'tag_generator'));
    1718        add_action('load-toplevel_page_wpcf7', array(__CLASS__, 'tag_generator'));
    1819
    … …  
    130131
    131132    public static function tag_generator() {
     133        if (! function_exists( 'wpcf7_add_tag_generator'))
     134            return;
     135
    132136        wpcf7_add_tag_generator('time',
    133137            __('Time field', 'wpcf7'),

  • contact-form-7-datepicker/trunk/readme.txt

    r820497 r867417  
    33Tags: wordpress, datepicker, timepicker, date, time, calendar, contact form 7, forms, jqueryui
    44Requires at least: 3.6.1
    5 Tested up to: 3.8
    6 Stable tag: 2.4.3
     5Tested up to: 3.8.1
     6Stable tag: 2.4.4
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    3333
    3434== Changelog ==
     35
     36= 2.4.4 =
     37* Compatible with CF7 3.7.2
    3538
    3639= 2.4.3 =
Note: See TracChangeset for help on using the changeset viewer.