Merge pull request #485 from GetDKAN/7.x-1.14.3-upgrade

dkan upgrade 1.14.3
GetDKAN · Feb 16, 2018 · 719927d · 719927d
2 parents 0fd5f12 + aa9b270
commit 719927d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 28 deletions.
diff --git a/build-dkan.make b/build-dkan.make
@@ -8,4 +8,4 @@ projects:
     download:
       type: git
       url: https://github.com/GetDKAN/dkan.git
-      tag: 7.x-1.14.2
+      tag: 7.x-1.14.3
diff --git a/dkan/CHANGELOG.txt b/dkan/CHANGELOG.txt
@@ -1,15 +1,19 @@
+7.x-1.14.3
+----------
+ - #2377 Upgrade entity to 1.9
+
 7.x-1.14.2
 ----------
- - #2359 Upgrade filefield_sources to 1.11 
- - #2341 Modifies curl settings so url headers and info can be properly acquired with curl 
- - #2370 Patch features to add new line after <?php 
- - #2346 Updated Help page; can add your company to listing 
+ - #2359 Upgrade filefield_sources to 1.11
+ - #2341 Modifies curl settings so url headers and info can be properly acquired with curl
+ - #2370 Patch features to add new line after <?php
+ - #2346 Updated Help page; can add your company to listing
  - Remove out-dated owners.md file
- - #2345 Site Manager Monthly Maintenance checklist 
- - #2347 Moving the "Adding New Content" page to main admin doc tree 
- - #2321 Update @resource_all_09 scenario 
- - #2327 Add results count to dkan admin views 
- - #2337 Pin sphinx to 1.5.6 
+ - #2345 Site Manager Monthly Maintenance checklist
+ - #2347 Moving the "Adding New Content" page to main admin doc tree
+ - #2321 Update @resource_all_09 scenario
+ - #2327 Add results count to dkan admin views
+ - #2337 Pin sphinx to 1.5.6
  - #2332 Remove redundant debug output
 
 7.x-1.14.1

diff --git a/dkan/drupal-org.make b/dkan/drupal-org.make
@@ -72,7 +72,7 @@ projects:
     version: '2.1'
   entity:
     download:
-      full_version: 7.x-1.8
+      full_version: 7.x-1.9
     patch:
       2341611: https://www.drupal.org/files/issues/entity-multivalue-token-replacement-fix-2341611-0.patch
       2564119: https://www.drupal.org/files/issues/Use-array-in-foreach-statement-2564119-1.patch

diff --git a/dkan/modules/contrib/entity/entity.info b/dkan/modules/contrib/entity/entity.info
@@ -25,7 +25,7 @@ files[] = views/handlers/entity_views_handler_field_uri.inc
 files[] = views/handlers/entity_views_handler_relationship_by_bundle.inc
 files[] = views/handlers/entity_views_handler_relationship.inc
 files[] = views/plugins/entity_views_plugin_row_entity_view.inc
-; Information added by drush on 2017-03-08
-version = "7.x-1.8"
+; Information added by drush on 2018-02-14
+version = "7.x-1.9"
 project = "entity"
-datestamp = "1489006926"
+datestamp = "1518619994"
diff --git a/dkan/modules/contrib/entity/entity_token.info b/dkan/modules/contrib/entity/entity_token.info
@@ -5,7 +5,7 @@ files[] = entity_token.tokens.inc
 files[] = entity_token.module
 dependencies[] = entity
 
-; Information added by drush on 2017-03-08
-version = "7.x-1.8"
+; Information added by drush on 2018-02-14
+version = "7.x-1.9"
 project = "entity"
-datestamp = "1489006926"
+datestamp = "1518619994"
diff --git a/dkan/modules/contrib/entity/includes/entity.wrapper.inc b/dkan/modules/contrib/entity/includes/entity.wrapper.inc
@@ -121,7 +121,7 @@ abstract class EntityMetadataWrapper {
     if (!$this->validate($value)) {
       throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
         // An exception's message is output through check_plain().
-        '!value' => is_array($value) || is_object($value) ? var_export($value) : $value,
+        '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
         '!location' => $this->debugIdentifierLocation(),
       )));
     }
@@ -755,7 +755,7 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
     if (!$this->validate($value)) {
       throw new EntityMetadataWrapperException(t('Invalid data value given. Be sure it matches the required data type and format. Value at !location: !value.', array(
         // An exception's message is output through check_plain().
-        '!value' => is_array($value) || is_object($value) ? var_export($value) : $value,
+        '!value' => is_array($value) || is_object($value) ? var_export($value, TRUE) : $value,
         '!location' => $this->debugIdentifierLocation(),
       )));
     }

diff --git a/dkan/modules/contrib/entity/tests/entity_feature.info b/dkan/modules/contrib/entity/tests/entity_feature.info
@@ -6,7 +6,7 @@ files[] = entity_feature.module
 dependencies[] = entity_test
 hidden = TRUE
 
-; Information added by drush on 2017-03-08
-version = "7.x-1.8"
+; Information added by drush on 2018-02-14
+version = "7.x-1.9"
 project = "entity"
-datestamp = "1489006926"
+datestamp = "1518619994"
diff --git a/dkan/modules/contrib/entity/tests/entity_test.info b/dkan/modules/contrib/entity/tests/entity_test.info
@@ -7,7 +7,7 @@ files[] = entity_test.install
 dependencies[] = entity
 hidden = TRUE
 
-; Information added by drush on 2017-03-08
-version = "7.x-1.8"
+; Information added by drush on 2018-02-14
+version = "7.x-1.9"
 project = "entity"
-datestamp = "1489006926"
+datestamp = "1518619994"
diff --git a/dkan/modules/contrib/entity/tests/entity_test_i18n.info b/dkan/modules/contrib/entity/tests/entity_test_i18n.info
@@ -5,7 +5,7 @@ dependencies[] = i18n_string
 package = Multilingual - Internationalization
 core = 7.x
 hidden = TRUE
-; Information added by drush on 2017-03-08
-version = "7.x-1.8"
+; Information added by drush on 2018-02-14
+version = "7.x-1.9"
 project = "entity"
-datestamp = "1489006926"
+datestamp = "1518619994"