Merge pull request #68 from pods-framework/1.x

Merge for 1.2.2 Release
pods-framework · Jun 7, 2018 · c3a169f · c3a169f
2 parents 7fe3d3a + b10dc81
commit c3a169f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/classes/class-pods-beaver-page-data.php b/classes/class-pods-beaver-page-data.php
@@ -288,7 +288,7 @@ public static function get_field_photo( $settings, $property ) {
 		$field_url      = $settings->field . '._src.' . pods_v( 'image_size', $settings, '');
 		$content['url'] = $pod->display( $field_url );
 
-		if ( ! isset( $content['url'] ) && isset( $settings->default_img_src ) ) {
+		if ( empty( $content['url'] ) && isset( $settings->default_img_src ) ) {
 			$content['id']  = $settings->default_img;
 			$content['url'] = $settings->default_img_src;
 		}
@@ -584,14 +584,14 @@ private static function recurse_pod_fields( $pod_name, $field_options = array(),
 
 				if ( isset( $field['type'] ) && in_array( $field['type'], PodsForm::tableless_field_types(), true ) ) {
 					if ( ! empty( $field['table_info'] ) && ! empty( $field['table_info']['pod'] ) ) { // Related item is a pod
-						if ( 'single' === $field['options']['pick_format_type'] ) {// recursion only wanted if single Issue #16
+						if ( 'single' === pods_v( 'pick_format_type', $field['options'] ) ) {// recursion only wanted if single Issue #16
 							$linked_pod = $field['table_info']['pod']['name'];
 						}
 					} elseif ( 'taxonomy' === $field['type'] ) {
 						// $linked_pod = $field_name; @todo Remove this?
 						// removed Media Traversal -> use default BB field connections or Templates
-					} elseif ( 'attachment' === $field['options']['file_uploader'] ) {
-						if ( 'single' === $field['options']['file_format_type'] ) {// recursion not wanted Issue #16
+					} elseif ( 'attachment' === pods_v( 'file_uploader', $field['options'] ) ) {
+						if ( 'single' === pods_v( 'file_format_type', $field['options'] ) ) {// recursion not wanted Issue #16
 							$linked_pod = 'media';
 						}
 					} elseif ( 'user' === $field['pick_object'] ) {

diff --git a/includes/pods-page-data.php b/includes/pods-page-data.php
@@ -48,6 +48,7 @@
 		'string',
 		'html',
 		'custom_field',
+		'url',
 	),
 	'getter' => 'PodsBeaverPageData::get_template',
 );
@@ -332,7 +333,7 @@
  * Pods Settings / User
  */
 $data = array(
-	'label'  => __( 'User or Settings Fields', 'pods-beaver-builder-themer-add-on' ),
+	'label'  => __( 'User or Settings URL Field ', 'pods-beaver-builder-themer-add-on' ),
 	'group'  => 'pods',
 	'type'   => array(
 		'url',

diff --git a/pods-beaver-themer.php b/pods-beaver-themer.php
@@ -3,7 +3,7 @@
  * Plugin Name: Pods Beaver Themer Add-On
  * Plugin URI: http://pods.io/
  * Description: Integration with Beaver Builder Themer (https://www.wpbeaverbuilder.com). Provides a UI for mapping Field Connections with Pods
- * Version: 1.2.1
+ * Version: 1.2.2
  * Author: Quasel, Pods Framework Team
  * Author URI: http://pods.io/about/
  * Text Domain: pods-beaver-builder-themer-add-on
@@ -30,7 +30,7 @@
  * @package Pods\Beaver Themer
  */
 
-define( 'PODS_BEAVER_VERSION', '1.2.1' );
+define( 'PODS_BEAVER_VERSION', '1.2.2' );
 define( 'PODS_BEAVER_FILE', __FILE__ );
 define( 'PODS_BEAVER_DIR', plugin_dir_path( PODS_BEAVER_FILE ) );
 define( 'PODS_BEAVER_URL', plugin_dir_url( PODS_BEAVER_FILE ) );

diff --git a/readme.txt b/readme.txt
@@ -71,6 +71,12 @@ You can use [GitHub Updater](https://github.com/afragen/github-updater). A simpl
 
 == Changelog ==
 
+=1.2.2 - June 7th, 2018
+* Added: Option to use MagicTags for URLs, #39
+* Fixed: Default Image Option not working, #67
+* Fixed: Minor Code quality improvments and some labels
+
+
 = 1.2.1 - November 10th, 2017
 * Fixed default settings array for setings pods