Fixed image / file migration settings

Signed-off-by: Elliot Condon <e@elliotcondon.com>
temperatio · Mar 18, 2014 · 7a97a88 · 7a97a88
1 parent ca327f3
commit 7a97a88
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 8 deletions.
diff --git a/admin/updates/5.0.0.php b/admin/updates/5.0.0.php
@@ -233,6 +233,14 @@ function _migrate_field_500( $field ) {
 	// image / file settings
 	if( $field['type'] == 'image' || $field['type'] == 'file' ) {
 
+		// save_format is now return_format
+		if( !empty($field['save_format']) ) {
+
+			$field['return_format'] = acf_extract_var( $field, 'save_format' );
+
+		}
+
+
 		// object is now array
 		if( $field['return_format'] == 'object' ) {
 

diff --git a/config.codekit b/config.codekit
@@ -18,14 +18,6 @@
 		"outputAbbreviatedPath": "No Output Path",
 		"outputPathIsSetByUser": 0
 		},
-	"\/admin\/field-group.php": {
-		"fileType": 8192,
-		"ignore": 0,
-		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/admin\/field-group.php",
-		"outputAbbreviatedPath": "No Output Path",
-		"outputPathIsSetByUser": 0
-		},
 	"\/admin\/field-groups.php": {
 		"fileType": 8192,
 		"ignore": 0,
@@ -1151,6 +1143,26 @@
 		"outputPathIsSetByUser": 0,
 		"processed": 0
 		},
+	"\/js\/field-group.js": {
+		"fileType": 64,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"inputAbbreviatedPath": "\/js\/field-group.js",
+		"outputAbbreviatedPath": "\/js\/field-group.min.js",
+		"outputPathIsSetByUser": 0,
+		"outputStyle": 1,
+		"syntaxCheckerStyle": 0
+		},
+	"\/js\/field-group.min.js": {
+		"fileType": 64,
+		"ignore": 1,
+		"ignoreWasSetByUser": 0,
+		"inputAbbreviatedPath": "\/js\/field-group.min.js",
+		"outputAbbreviatedPath": "\/js\/field-group.min.min.js",
+		"outputPathIsSetByUser": 0,
+		"outputStyle": 1,
+		"syntaxCheckerStyle": 1
+		},
 	"\/js\/input.js": {
 		"fileType": 64,
 		"ignore": 1,

diff --git a/fields/file.php b/fields/file.php
@@ -56,6 +56,13 @@ function __construct() {
 	function load_field( $field ) {
 
 		// v4 to v5 compatibility
+		if( !empty($field['save_format']) ) {
+
+			$field['return_format'] = acf_extract_var( $field, 'save_format' );
+
+		}
+
+
 		if( $field['return_format'] == 'object' ) {
 
 			$field['return_format'] = 'array';

diff --git a/fields/image.php b/fields/image.php
@@ -57,6 +57,13 @@ function __construct() {
 	function load_field( $field ) {
 
 		// v4 to v5 compatibility
+		if( !empty($field['save_format']) ) {
+
+			$field['return_format'] = acf_extract_var( $field, 'save_format' );
+
+		}
+
+
 		if( $field['return_format'] == 'object' ) {
 
 			$field['return_format'] = 'array';