Merge branch 'develop' into issue-468

Conflicts (resolved):
	sites/all/modules/unl/unl.info

CHANGELOG.txt

 
+Drupal 7.16, 2012-10-17
+-----------------------
+- Fixed security issues (Arbitrary PHP code execution and information
+  disclosure). See SA-CORE-2012-003.
+
 Drupal 7.15, 2012-08-01
 -----------------------
 - Introduced a 'user_password_reset_timeout' variable to allow the 24-hour

README.md

@@ -103,6 +103,10 @@ In this example the web root is /Library/WebServer/Documents and Apache runs as
 
      - Fix so that drush pulls in the correct uri parameter. See http://drupal.org/node/1331106
 
+  *  entity/entity.module, entity/modules/callbacks.inc
+
+     - Add 'uri callback' for file entities. See http://drupal.org/node/1481372#comment-6529650
+
   *  workbench_moderation.module
 
      - Fix broken books in workbench_moderation_node_presave(). See http://drupal.org/node/1505060

includes/bootstrap.inc

@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.15');
+define('VERSION', '7.16');
 
 /**
  * Core API compatibility.

includes/install.core.inc

@@ -295,12 +295,11 @@ function install_begin_request(&$install_state) {
   else {
     $task = NULL;
 
-    // Since previous versions of Drupal stored database connection information
-    // in the 'db_url' variable, we should never let an installation proceed if
-    // this variable is defined and the settings file was not verified above
-    // (otherwise we risk installing over an existing site whose settings file
-    // has not yet been updated).
-    if (!empty($GLOBALS['db_url'])) {
+    // Do not install over a configured settings.php. Check the 'db_url'
+    // variable in addition to 'databases', since previous versions of Drupal
+    // used that (and we do not want to allow installations on an existing site
+    // whose settings file has not yet been updated).
+    if (!empty($GLOBALS['databases']) || !empty($GLOBALS['db_url'])) {
       throw new Exception(install_already_done_error());
     }
   }

modules/aggregator/aggregator.info

@@ -7,8 +7,8 @@ files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/aggregator/tests/aggregator_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/block/block.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = block.test
 configure = admin/structure/block
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/block/tests/block_test.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/block/tests/themes/block_test_theme/block_test_theme.info

@@ -13,8 +13,8 @@ regions[footer] = Footer
 regions[highlighted] = Highlighted
 regions[help] = Help
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/blog/blog.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = blog.test
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/book/book.info

@@ -7,8 +7,8 @@ files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/color/color.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = color.test
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/comment/comment.info

@@ -9,8 +9,8 @@ files[] = comment.test
 configure = admin/content/comment
 stylesheets[all][] = comment.css
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/contact/contact.info

@@ -6,8 +6,8 @@ core = 7.x
 files[] = contact.test
 configure = admin/structure/contact
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/contextual/contextual.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = contextual.test
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/dashboard/dashboard.info

@@ -7,8 +7,8 @@ files[] = dashboard.test
 dependencies[] = block
 configure = admin/dashboard/customize
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/dblog/dblog.info

@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = dblog.test
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/field/field.info

@@ -10,8 +10,8 @@ dependencies[] = field_sql_storage
 required = TRUE
 stylesheets[all][] = theme/field.css
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/field/modules/field_sql_storage/field_sql_storage.info

@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = field_sql_storage.test
 required = TRUE
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"
 

modules/field/modules/list/list.info

@@ -7,8 +7,8 @@ dependencies[] = field
 dependencies[] = options
 files[] = tests/list.test
 
-; Information added by drupal.org packaging script on 2012-08-01
-version = "7.15"
+; Information added by drupal.org packaging script on 2012-10-17
+version = "7.16"
 project = "drupal"
-datestamp = "1343839327"
+datestamp = "1350508567"