diff --git a/README-UNL.txt b/README-UNL.txt index bd52223901ad9a87f01fa66147856cb5d5cc67f9..84dc097f097b06e92d2fce45a85cbf348d5d1113 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 1846c5b8c36a2f16cadd16654ebe4a8d8727f3a3..34b11fdbae0c5ea9a9f82c81dc851ef7558c33b2 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']};