From 5468899054e5ee7eda13f3d95078f94959a73a93 Mon Sep 17 00:00:00 2001 From: Tim Steiner <tsteiner2@unl.edu> Date: Wed, 7 Dec 2011 17:22:21 +0000 Subject: [PATCH] [gh-244] Merging from testing into staging git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1335 20a16fea-79d4-4915-8869-1ea9d5ebf173 --- README-UNL.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README-UNL.txt b/README-UNL.txt index fbbef896..d6298442 100644 --- a/README-UNL.txt +++ b/README-UNL.txt @@ -27,22 +27,12 @@ modules/image/image.field.inc * 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 - -------------------------------------- sites/all/modules/form_builder/modules/webform/form_builder_webform.module * In form_builder_webform_components_page() load jquery.ui.datepicker.min.js so the Date element will work on a new form that does not have ui.datepicker loaded * http://drupal.org/node/1307838 -***************************************** -** Other -***************************************** +------------------------------------ sites/sites.php * Added support for $default_domains array. See includes/bootstrap.inc conf_path(). @@ -52,8 +42,3 @@ 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 -- GitLab