From f4c36afc1e637ab9bbe0aaa132bb8be6d86415e2 Mon Sep 17 00:00:00 2001
From: Eric Rasmussen <eric@unl.edu>
Date: Mon, 10 Oct 2011 18:59:33 +0000
Subject: [PATCH] [gh-244] Merging testing into staging -c1136
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1137 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
README-UNL.txt | 32 +++++++++++++++++++++++++-------
includes/common.inc | 2 +-
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/README-UNL.txt b/README-UNL.txt
index bd522239..84dc097f 100644
--- a/README-UNL.txt
+++ b/README-UNL.txt
@@ -1,5 +1,9 @@
Hacks of Core:
+*****************************************
+** UNL Mods
+*****************************************
+
includes/bootstrap.inc
function drupal_settings_initialize()
* UNL change: include a "global" settings file that applies to all sites.
@@ -14,19 +18,27 @@ sites/all/modules/drush/commands/core/drupal/site_install_7.inc
function drush_core_site_install_version()
* UNL change! Setting this to FALSE because we don't want them and they're hard coded.
-------------------------------------
-
-rewrite.php
-used to allow public files to be accessed without the sites/<site_dir>/files prefix
-
-------------------------------------
+*****************************************
+** Patches
+*****************************************
modules/image/image.field.inc
* theme_image_formatter ignores attributes so classes can't be added to an image in a theme (needed for photo frame)
* http://drupal.org/node/1025796#comment-4298698
* http://drupal.org/files/issues/1025796.patch
-------------------------------------
+ ------------------------------------
+
+includes/common.inc
+ * EntityMalformedException: Missing bundle property on entity of type node. in entity_extract_ids() (line 7392 of /var/www/unl.edu/htdocs/includes/common.inc).
+ * http://gforge.unl.edu/gf/project/wdn_thm_drupal/tracker/?action=TrackerItemEdit&tracker_item_id=993&start=0
+ * http://drupal.org/node/1067750#comment-4941822
+ * Applied patch: http://drupal.org/files/issues/empty_string_bundle.patch
+
+
+*****************************************
+** Other
+*****************************************
sites/sites.php
* Added support for $default_domains array. See includes/bootstrap.inc conf_path().
@@ -35,3 +47,9 @@ sites/sites.php
sites/example.sites.php
* Added an example of the $default_domains array.
+ * Added the stub record needed for creating site aliases.
+
+ ------------------------------------
+
+rewrite.php
+used to allow public files to be accessed without the sites/<site_dir>/files prefix
diff --git a/includes/common.inc b/includes/common.inc
index 1846c5b8..34b11fdb 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7388,7 +7388,7 @@ function entity_extract_ids($entity_type, $entity) {
if (!empty($info['entity keys']['bundle'])) {
// Explicitly fail for malformed entities missing the bundle property.
- if (!isset($entity->{$info['entity keys']['bundle']}) || $entity->{$info['entity keys']['bundle']} === '') {
+ if (!isset($entity->{$info['entity keys']['bundle']})) { //UNL Change - UNL Patch
throw new EntityMalformedException(t('Missing bundle property on entity of type @entity_type.', array('@entity_type' => $entity_type)));
}
$bundle = $entity->{$info['entity keys']['bundle']};
--
GitLab