Skip to content

Commit

Permalink
CMB2 Compatibility Update - PHP 7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
monecchi committed Aug 24, 2018
1 parent 1b91f07 commit aceb9b1
Show file tree
Hide file tree
Showing 289 changed files with 27,693 additions and 1,653 deletions.
5 changes: 5 additions & 0 deletions css/fontawesome.min.css

Large diffs are not rendered by default.

323 changes: 151 additions & 172 deletions ebor_cpt.php

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion ebor_functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,19 @@ function ebor_framework_add_customize_page_link() {
add_action ('admin_menu', 'ebor_framework_add_customize_page_link');
}*/

add_filter('widget_text', 'do_shortcode');
add_filter('widget_text', 'do_shortcode');


if( ! function_exists('ebor_wp_get_image_id') ) {
/**
* Custom mrancho WordPress Helper function to get attachment id from url
*/
function ebor_wp_get_image_id( $image_url )
{
global $wpdb;
$attachment = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid='%s';", $image_url ) );
if( $attachment ) :
return $attachment[0];
endif;
}
}
214 changes: 0 additions & 214 deletions getting_started.php

This file was deleted.

46 changes: 44 additions & 2 deletions init.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ function foodstack_framework_load_textdomain() {
'malefic_vc_shortcodes' => '0',
'waves_vc_shortcodes' => '0',
'sugarland_vc_shortcodes' => '0',
'foundry_vc_shortcodes' => '0'
'foundry_vc_shortcodes' => '0',
'meetup_vc_shortcodes' => '0',
'hygge_vc_shortcodes' => '0',
'somnus_vc_shortcodes' => '0'
);
$framework_options = wp_parse_args( get_option('ebor_framework_options'), $defaults);

Expand Down Expand Up @@ -189,6 +192,36 @@ function foodstack_framework_load_textdomain() {
if( '1' == $framework_options['foundry_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/foundry/init.php' );
}
if( '1' == $framework_options['griddr_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/griddr/init.php' );
}
if( '1' == $framework_options['candar_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/candar/init.php' );
}
if( '1' == $framework_options['creatink_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/creatink/init.php' );
}
if( '1' == $framework_options['gaze_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/gaze/init.php' );
}
if( '1' == $framework_options['belton_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/belton/init.php' );
}
if( '1' == $framework_options['brailie_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/brailie/init.php' );
}
if( '1' == $framework_options['pivot_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/pivot/init.php' );
}
if( '1' == $framework_options['meetup_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/meetup/init.php' );
}
if( '1' == $framework_options['hygge_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/hygge/init.php' );
}
if( '1' == $framework_options['somnus_vc_shortcodes'] ){
require_once( EBOR_FRAMEWORK_PATH . 'vc_blocks/somnus/init.php' );
}

/**
* Register appropriate widgets
Expand Down Expand Up @@ -220,14 +253,23 @@ function foodstack_framework_load_textdomain() {
if( '1' == $framework_options['malefic_widgets'] ){
require_once( EBOR_FRAMEWORK_PATH . 'widgets/malefic-widgets.php' );
}
if( '1' == $framework_options['creatink_widgets'] ){
require_once( EBOR_FRAMEWORK_PATH . 'widgets/creatink-widgets.php' );
}
if( '1' == $framework_options['brailie_widgets'] ){
require_once( EBOR_FRAMEWORK_PATH . 'widgets/brailie-widgets.php' );
}
if( '1' == $framework_options['gaze_widgets'] ){
require_once( EBOR_FRAMEWORK_PATH . 'widgets/gaze-widgets.php' );
}

/**
* Register Food Menu Post Type // Custom FoodStack Framework // Mrancho
*/
if( '1' == $framework_options['food_menu_post_type'] ){
add_action( 'init', 'ebor_framework_register_food_menu', 10 ); // food_menu
add_action( 'init', 'ebor_framework_create_food_menu_taxonomies', 10 ); // food_menu_categories
add_action( 'init', 'ebor_framework_create_food_menu_tags', 10 ); // food_tag // ingredients
add_action( 'init', 'ebor_framework_register_food_menu', 10 ); // food_menu
}

/**
Expand Down
6 changes: 1 addition & 5 deletions metaboxes/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ All notable changes to this project will be documented in this file.

## Unreleased
### Enhancements

* Repeatable fields are now drag-sortable. Props [@lipemat](https://github.com/lipemat) ([#1142](https://github.com/CMB2/CMB2/pull/1142)).
* Update the `sv_SE` translation. Props [@edvind](https://github.com/edvind) ([#370](https://github.com/CMB2/CMB2/issues/370)).

### Bug Fixes

## [2.4.2 - 2018-05-25](https://github.com/CMB2/CMB2/releases/tag/v2.4.2)
Expand Down Expand Up @@ -46,7 +42,7 @@ All notable changes to this project will be documented in this file.
```
* Improve/add comment info banners at top of CMB2 CSS files.
* Added `resetBoxes`/`resetBox` Javascript methods for resetting CMB2 box forms.
* Improved styles for fields in the new-term form.
* Improved styles for fiels in the new-term form.
* New `CMB2_Boxes` methods for filtering instances of `CMB2`, `CMB2_Boxes::get_by( $property, $optional_compare )` and `CMB2_Boxes::filter_by( $property, $to_ignore = null )`.

### Bug Fixes
Expand Down
14 changes: 9 additions & 5 deletions metaboxes/css/cmb2-display-rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions metaboxes/css/cmb2-display-rtl.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions metaboxes/css/cmb2-display.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions metaboxes/css/cmb2-display.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions metaboxes/css/cmb2-display.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit aceb9b1

Please sign in to comment.