Permalink
Browse files

Update core

  • Loading branch information...
1 parent e3eeca9 commit c3b79c01630218ea98a9b29c26b58d1e5580a4a3 @holtzermann17 holtzermann17 committed Mar 4, 2013
Showing with 444 additions and 448 deletions.
  1. +0 −50 .gitignore
  2. +0 −11 .htaccess
  3. +5 −0 CHANGELOG.txt
  4. +1 −1 includes/bootstrap.inc
  5. +0 −1 includes/common.inc
  6. +3 −3 includes/database/mysql/database.inc
  7. +1 −1 includes/database/mysql/schema.inc
  8. +3 −3 modules/aggregator/aggregator.info
  9. +3 −3 modules/aggregator/tests/aggregator_test.info
  10. +3 −3 modules/block/block.info
  11. +3 −3 modules/block/tests/block_test.info
  12. +3 −3 modules/block/tests/themes/block_test_theme/block_test_theme.info
  13. +3 −3 modules/blog/blog.info
  14. +3 −3 modules/book/book.info
  15. +3 −3 modules/color/color.info
  16. +3 −3 modules/comment/comment.info
  17. +3 −3 modules/contact/contact.info
  18. +3 −3 modules/contextual/contextual.info
  19. +3 −3 modules/dashboard/dashboard.info
  20. +3 −3 modules/dblog/dblog.info
  21. +3 −3 modules/field/field.info
  22. +3 −3 modules/field/modules/field_sql_storage/field_sql_storage.info
  23. +3 −3 modules/field/modules/list/list.info
  24. +3 −3 modules/field/modules/list/tests/list_test.info
  25. +3 −3 modules/field/modules/number/number.info
  26. +3 −3 modules/field/modules/options/options.info
  27. +3 −3 modules/field/modules/text/text.info
  28. +3 −3 modules/field/tests/field_test.info
  29. +3 −3 modules/field_ui/field_ui.info
  30. +3 −3 modules/file/file.info
  31. +3 −3 modules/file/tests/file_module_test.info
  32. +3 −3 modules/filter/filter.info
  33. +3 −3 modules/forum/forum.info
  34. +3 −3 modules/help/help.info
  35. +3 −3 modules/image/image.info
  36. +47 −7 modules/image/image.module
  37. +29 −16 modules/image/image.test
  38. +3 −3 modules/image/tests/image_module_test.info
  39. +3 −3 modules/locale/locale.info
  40. +3 −3 modules/locale/tests/locale_test.info
  41. +3 −3 modules/menu/menu.info
  42. +3 −3 modules/node/node.info
  43. +3 −3 modules/node/tests/node_access_test.info
  44. +3 −3 modules/node/tests/node_test.info
  45. +3 −3 modules/node/tests/node_test_exception.info
  46. +3 −3 modules/openid/openid.info
  47. +3 −3 modules/openid/tests/openid_test.info
  48. +3 −3 modules/overlay/overlay.info
  49. +3 −3 modules/path/path.info
  50. +3 −3 modules/php/php.info
  51. +3 −3 modules/poll/poll.info
  52. +3 −3 modules/profile/profile.info
  53. +3 −3 modules/rdf/rdf.info
  54. +3 −3 modules/rdf/tests/rdf_test.info
  55. +3 −3 modules/search/search.info
  56. +3 −3 modules/search/tests/search_embedded_form.info
  57. +3 −3 modules/search/tests/search_extra_type.info
  58. +3 −3 modules/shortcut/shortcut.info
  59. +3 −3 modules/simpletest/simpletest.info
  60. +3 −3 modules/simpletest/tests/actions_loop_test.info
  61. +3 −3 modules/simpletest/tests/ajax_forms_test.info
  62. +3 −3 modules/simpletest/tests/ajax_test.info
  63. +3 −3 modules/simpletest/tests/batch_test.info
  64. +3 −3 modules/simpletest/tests/common_test.info
  65. +3 −3 modules/simpletest/tests/common_test_cron_helper.info
  66. +3 −3 modules/simpletest/tests/database_test.info
  67. +3 −3 ...simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
  68. +3 −3 ...letest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
  69. +3 −3 modules/simpletest/tests/entity_cache_test.info
  70. +3 −3 modules/simpletest/tests/entity_cache_test_dependency.info
  71. +3 −3 modules/simpletest/tests/entity_crud_hook_test.info
  72. +3 −3 modules/simpletest/tests/entity_query_access_test.info
  73. +3 −3 modules/simpletest/tests/error_test.info
  74. +3 −3 modules/simpletest/tests/file_test.info
  75. +3 −3 modules/simpletest/tests/filter_test.info
  76. +3 −3 modules/simpletest/tests/form_test.info
  77. +3 −3 modules/simpletest/tests/image_test.info
  78. +3 −3 modules/simpletest/tests/menu_test.info
  79. +3 −3 modules/simpletest/tests/module_test.info
  80. +3 −3 modules/simpletest/tests/path_test.info
  81. +3 −3 modules/simpletest/tests/requirements1_test.info
  82. +3 −3 modules/simpletest/tests/requirements2_test.info
  83. +3 −3 modules/simpletest/tests/session_test.info
  84. +3 −3 modules/simpletest/tests/system_dependencies_test.info
  85. +3 −3 modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
  86. +3 −3 modules/simpletest/tests/system_incompatible_core_version_test.info
  87. +3 −3 modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
  88. +3 −3 modules/simpletest/tests/system_incompatible_module_version_test.info
  89. +3 −3 modules/simpletest/tests/system_test.info
  90. +3 −3 modules/simpletest/tests/taxonomy_test.info
  91. +3 −3 modules/simpletest/tests/theme_test.info
  92. +3 −3 modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
  93. +3 −3 modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
  94. +3 −3 modules/simpletest/tests/themes/test_theme/test_theme.info
  95. +3 −3 modules/simpletest/tests/update_script_test.info
  96. +3 −3 modules/simpletest/tests/update_test_1.info
  97. +3 −3 modules/simpletest/tests/update_test_2.info
  98. +3 −3 modules/simpletest/tests/update_test_3.info
  99. +3 −3 modules/simpletest/tests/url_alter_test.info
  100. +3 −3 modules/simpletest/tests/xmlrpc_test.info
  101. +3 −3 modules/statistics/statistics.info
  102. +3 −3 modules/syslog/syslog.info
  103. +3 −3 modules/system/system.info
  104. +3 −3 modules/taxonomy/taxonomy.info
  105. +3 −3 modules/toolbar/toolbar.info
  106. +3 −3 modules/tracker/tracker.info
  107. +3 −3 modules/translation/tests/translation_test.info
  108. +3 −3 modules/translation/translation.info
  109. +3 −3 modules/trigger/tests/trigger_test.info
  110. +3 −3 modules/trigger/trigger.info
  111. +3 −3 modules/update/tests/aaa_update_test.info
  112. +3 −3 modules/update/tests/bbb_update_test.info
  113. +3 −3 modules/update/tests/ccc_update_test.info
  114. +3 −3 modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
  115. +3 −3 modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
  116. +3 −3 modules/update/tests/update_test.info
  117. +3 −3 modules/update/update.info
  118. +3 −3 modules/user/tests/user_form_test.info
  119. +3 −3 modules/user/user.info
  120. +1 −1 modules/user/user.test
  121. +3 −3 profiles/minimal/minimal.info
  122. +3 −3 profiles/standard/standard.info
  123. +3 −3 .../testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
  124. +3 −3 ...ting/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
  125. +3 −3 profiles/testing/testing.info
  126. +3 −3 themes/bartik/bartik.info
  127. +3 −3 themes/garland/garland.info
  128. +3 −3 themes/seven/seven.info
  129. +3 −3 themes/stark/stark.info
View
@@ -4,53 +4,3 @@ sites/*/settings*.php
# Ignore paths that contain user-generated content.
sites/*/files
sites/*/private
-
-includes/database/mysql/schema.inc~
-sites/all/libraries/ARC2/arc/README.md
-sites/all/libraries/ARC2/arc/composer.json
-sites/all/libraries/ace/
-sites/all/modules/antispam/
-sites/all/modules/apachesolr/
-sites/all/modules/apachesolr_views/
-sites/all/modules/backup_migrate/
-sites/all/modules/blockanonymouslinks/
-sites/all/modules/captcha/
-sites/all/modules/commentrss/
-sites/all/modules/content_access/
-sites/all/modules/ctools/
-sites/all/modules/date/
-sites/all/modules/delete_all/
-sites/all/modules/devel/
-sites/all/modules/dhtml_menu/
-sites/all/modules/efq_views/
-sites/all/modules/entity/
-sites/all/modules/entityreference/
-sites/all/modules/features/
-sites/all/modules/filefield_paths/
-sites/all/modules/legal/
-sites/all/modules/mathjax/mathjax.module~
-sites/all/modules/migrate/
-sites/all/modules/msc_browser/README.queries~
-sites/all/modules/msc_browser/msc_browser.module~
-sites/all/modules/nodeaccess/
-sites/all/modules/og/
-sites/all/modules/pathauto/
-sites/all/modules/privatemsg/
-sites/all/modules/profile2/
-sites/all/modules/rdfx/
-sites/all/modules/recaptcha/
-sites/all/modules/references/
-sites/all/modules/relation/
-sites/all/modules/relation_select/
-sites/all/modules/reroute_email/
-sites/all/modules/riddler/
-sites/all/modules/sparql/
-sites/all/modules/subform/
-sites/all/modules/token/
-sites/all/modules/userpoints/
-sites/all/modules/userpoints_nc/
-sites/all/modules/views/
-sites/all/modules/views_bulk_operations/
-sites/all/modules/views_php/
-sites/all/modules/watcher/
-sites/all/modules/wysiwyg/
View
@@ -56,17 +56,6 @@ DirectoryIndex index.php index.html index.htm
<IfModule mod_rewrite.c>
RewriteEngine on
- # These are the two kinds of patterns we want to match:
- # http://planetmath.org/encyclopedia/ContrageometricProportion.html
- # http://planetmath.org/?op=getobj&id=6585&from=objects
-
- # The first one is easy:
- RewriteRule ^encyclopedia/([^.]*)\.html$ /$1 [R=301,L]
-
- # The next one is easier to deal with via Drupal custom code...
- # see
-
-
# Block access to "hidden" directories whose names begin with a period. This
# includes directories used by version control systems such as Subversion or
# Git to store control files. Files whose names begin with a period, as well
View
@@ -1,3 +1,8 @@
+
+Drupal 7.20, 2013-02-20
+-----------------------
+- Fixed security issues (denial of service). See SA-CORE-2013-002.
+
Drupal 7.19, 2013-01-16
-----------------------
- Fixed security issues (multiple vulnerabilities). See SA-CORE-2013-001.
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.19');
+define('VERSION', '7.20');
/**
* Core API compatibility.
View
@@ -7630,7 +7630,6 @@ 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']} === '') {
- dd(debug_backtrace());
throw new EntityMalformedException(t('Missing bundle property on entity of type @entity_type.', array('@entity_type' => $entity_type)));
}
$bundle = $entity->{$info['entity keys']['bundle']};
@@ -54,11 +54,11 @@ class DatabaseConnection_mysql extends DatabaseConnection {
// certain one has been set; otherwise, MySQL defaults to 'utf8_general_ci'
// for UTF-8.
if (!empty($connection_options['collation'])) {
- $this->exec('SET NAMES utf8mb4 COLLATE ' . $connection_options['collation']);
+ $this->exec('SET NAMES utf8 COLLATE ' . $connection_options['collation']);
}
else {
- $this->exec('SET NAMES utf8mb4');
- }
+ $this->exec('SET NAMES utf8');
+ }
// Set MySQL init_commands if not already defined. Default Drupal's MySQL
// behavior to conform more closely to SQL standards. This allows Drupal
@@ -81,7 +81,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
// Provide defaults if needed.
$table += array(
'mysql_engine' => 'InnoDB',
- 'mysql_character_set' => 'utf8mb4',
+ 'mysql_character_set' => 'utf8',
);
$sql = "CREATE TABLE {" . $name . "} (\n";
@@ -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 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ core = 7.x
files[] = block.test
configure = admin/structure/block
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
hidden = TRUE
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -13,8 +13,8 @@ regions[footer] = Footer
regions[highlighted] = Highlighted
regions[help] = Help
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
files[] = blog.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -7,8 +7,8 @@ files[] = book.test
configure = admin/content/book/settings
stylesheets[all][] = book.css
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
files[] = color.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -9,8 +9,8 @@ files[] = comment.test
configure = admin/content/comment
stylesheets[all][] = comment.css
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ core = 7.x
files[] = contact.test
configure = admin/structure/contact
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
files[] = contextual.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -7,8 +7,8 @@ files[] = dashboard.test
dependencies[] = block
configure = admin/dashboard/customize
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ version = VERSION
core = 7.x
files[] = dblog.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -10,8 +10,8 @@ dependencies[] = field_sql_storage
required = TRUE
stylesheets[all][] = theme/field.css
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -7,8 +7,8 @@ dependencies[] = field
files[] = field_sql_storage.test
required = TRUE
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -7,8 +7,8 @@ dependencies[] = field
dependencies[] = options
files[] = tests/list.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -5,8 +5,8 @@ package = Testing
version = VERSION
hidden = TRUE
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field
files[] = number.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field
files[] = options.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -7,8 +7,8 @@ dependencies[] = field
files[] = text.test
required = TRUE
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ files[] = field_test.entity.inc
version = VERSION
hidden = TRUE
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field
files[] = field_ui.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
@@ -6,8 +6,8 @@ core = 7.x
dependencies[] = field
files[] = tests/file.test
-; Information added by drupal.org packaging script on 2013-01-16
-version = "7.19"
+; Information added by drupal.org packaging script on 2013-02-20
+version = "7.20"
project = "drupal"
-datestamp = "1358374870"
+datestamp = "1361393684"
Oops, something went wrong.

0 comments on commit c3b79c0

Please sign in to comment.