diff --git a/core/modules/contact/contact.install b/core/modules/contact/contact.install
index d35abe9..ebb0cc5 100644
--- a/core/modules/contact/contact.install
+++ b/core/modules/contact/contact.install
@@ -29,7 +29,7 @@ function contact_install() {
function contact_update_dependencies() {
// Migrate users.data after User module prepared the tables.
$dependencies['contact'][8003] = array(
- 'user' => 8011,
+ 'user' => 8016,
);
return $dependencies;
}
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index dc20e25..06e3272 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -232,7 +232,7 @@ function _update_7000_field_create_instance($field, &$instance) {
*/
function field_update_dependencies() {
// Convert Field API to ConfigEntities after:
- $dependencies['field'][8003] = array(
+ $dependencies['field'][8002] = array(
// - Custom block bodies have been turned to fields.
'block' => 8008,
// - User pictures have been turned to fields.
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
index 51dc8b1..0ab6207 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
@@ -192,6 +192,13 @@ function testNonInitializedFields() {
* Tests hiding the view modes fieldset when there's only one available.
*/
function testSingleViewMode() {
+ // Create a test field.
+ $edit = array(
+ 'fields[_add_new_field][label]' => 'Test',
+ 'fields[_add_new_field][field_name]' => 'test',
+ );
+ $this->fieldUIAddNewField('admin/structure/taxonomy/manage/' . $this->vocabulary, $edit);
+
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary . '/display');
$this->assertNoText('Use custom display settings for the following view modes', 'Custom display settings fieldset found.');
diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc
index 2a8a50d..85fc9e1 100644
--- a/core/modules/forum/forum.admin.inc
+++ b/core/modules/forum/forum.admin.inc
@@ -52,11 +52,7 @@ function forum_form_forum($form, &$form_state, Term $term) {
'#description' => t('Short but meaningful name for this collection of threaded discussions.'),
'#required' => TRUE,
);
- $form['description'] = array('#type' => 'textarea',
- '#title' => t('Description'),
- '#default_value' => $term->description->value,
- '#description' => t('Description and guidelines for discussions within this forum.'),
- );
+
$form['parent']['#tree'] = TRUE;
$form['parent'][0] = _forum_parent_select($term->id(), t('Parent'), 'forum');
$form['weight'] = array('#type' => 'weight',
@@ -159,13 +155,6 @@ function forum_form_container($form, &$form_state, Term $term) {
'#description' => t('Short but meaningful name for this collection of related forums.'),
'#required' => TRUE
);
-
- $form['description'] = array(
- '#type' => 'textarea',
- '#title' => t('Description'),
- '#default_value' => $term->description->value,
- '#description' => t('Description and guidelines for forums within this container.')
- );
$form['parent']['#tree'] = TRUE;
$form['parent'][0] = _forum_parent_select($term->id(), t('Parent'), 'container');
$form['weight'] = array(
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 20e8631..74c0aeb 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -1056,7 +1056,6 @@ function template_preprocess_forum_list(&$variables) {
$row = 0;
// Sanitize each forum so that the template can safely print the data.
foreach ($variables['forums'] as $id => $forum) {
- $variables['forums'][$id]->description = filter_xss_admin($forum->description->value);
$variables['forums'][$id]->link = url("forum/" . $forum->id());
$variables['forums'][$id]->name = check_plain($forum->label());
$variables['forums'][$id]->is_container = !empty($forum->container);
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index 0232b21..d218350 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -381,13 +381,11 @@ function editForumVocabulary() {
* The created taxonomy term data.
*/
function createForum($type, $parent = 0) {
- // Generate a random name/description.
+ // Generate a random name.
$name = $this->randomName(10);
- $description = $this->randomName(100);
$edit = array(
'name' => $name,
- 'description' => $description,
'parent[0]' => $parent,
'weight' => '0',
);
@@ -405,7 +403,7 @@ function createForum($type, $parent = 0) {
);
// Verify forum.
- $term = db_query("SELECT * FROM {taxonomy_term_data} t WHERE t.vid = :vid AND t.name = :name AND t.description = :desc", array(':vid' => config('forum.settings')->get('vocabulary'), ':name' => $name, ':desc' => $description))->fetchAssoc();
+ $term = db_query("SELECT * FROM {taxonomy_term_data} t WHERE t.vid = :vid AND t.name = :name", array(':vid' => config('forum.settings')->get('vocabulary'), ':name' => $name))->fetchAssoc();
$this->assertTrue(!empty($term), 'The ' . $type . ' exists in the database');
// Verify forum hierarchy.
diff --git a/core/modules/forum/templates/forum-list.tpl.php b/core/modules/forum/templates/forum-list.tpl.php
index da8a12d..5242c8f 100644
--- a/core/modules/forum/templates/forum-list.tpl.php
+++ b/core/modules/forum/templates/forum-list.tpl.php
@@ -16,7 +16,6 @@
* - $forum->icon_title: Text alternative for the forum icon.
* - $forum->name: The name of the forum.
* - $forum->link: The URL to link to this forum.
- * - $forum->description: The description of this forum.
* - $forum->new_topics: TRUE if the forum contains unread posts.
* - $forum->new_url: A URL to the forum's unread posts.
* - $forum->new_text: Text for the above URL, which tells how many new posts.
@@ -55,9 +54,6 @@
icon_title; ?>
- description->value): ?>
- description->value; ?>
-
', $forum->depth); ?>
is_container): ?>
diff --git a/core/modules/overlay/overlay.install b/core/modules/overlay/overlay.install
index 588f871..29e6fa9 100644
--- a/core/modules/overlay/overlay.install
+++ b/core/modules/overlay/overlay.install
@@ -24,7 +24,7 @@ function overlay_enable() {
function overlay_update_dependencies() {
// Migrate users.data after User module prepared the tables.
$dependencies['overlay'][8000] = array(
- 'user' => 8011,
+ 'user' => 8016,
);
return $dependencies;
}
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
index cffa3f3..c582be3 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
@@ -48,17 +48,15 @@ function setUp() {
function testTermAlias() {
// Create a term in the default 'Tags' vocabulary with URL alias.
$vocabulary = taxonomy_vocabulary_load('tags');
- $description = $this->randomName();;
$edit = array(
'name' => $this->randomName(),
- 'description[value]' => $description,
'path[alias]' => $this->randomName(),
);
$this->drupalPost('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add', $edit, t('Save'));
// Confirm that the alias works.
$this->drupalGet($edit['path[alias]']);
- $this->assertText($description, 'Term can be accessed on URL alias.');
+ $this->assertText($edit['name'], 'Term can be accessed on URL alias.');
// Change the term's URL alias.
$tid = db_query("SELECT tid FROM {taxonomy_term_data} WHERE name = :name", array(':name' => $edit['name']))->fetchField();
@@ -68,11 +66,11 @@ function testTermAlias() {
// Confirm that the changed alias works.
$this->drupalGet($edit2['path[alias]']);
- $this->assertText($description, 'Term can be accessed on changed URL alias.');
+ $this->assertText($edit['name'], 'Term can be accessed on changed URL alias.');
// Confirm that the old alias no longer works.
$this->drupalGet($edit['path[alias]']);
- $this->assertNoText($description, 'Old URL alias has been removed after altering.');
+ $this->assertNoText($edit['name'], 'Old URL alias has been removed after altering.');
$this->assertResponse(404, 'Old URL alias returns 404.');
// Remove the term's URL alias.
@@ -82,7 +80,7 @@ function testTermAlias() {
// Confirm that the alias no longer works.
$this->drupalGet($edit2['path[alias]']);
- $this->assertNoText($description, 'Old URL alias has been removed after altering.');
+ $this->assertNoText($edit['name'], 'Old URL alias has been removed after altering.');
$this->assertResponse(404, 'Old URL alias returns 404.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/TaxonomyUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/TaxonomyUpgradePathTest.php
new file mode 100644
index 0000000..ebe8ac8
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/TaxonomyUpgradePathTest.php
@@ -0,0 +1,62 @@
+ 'Taxonomy upgrade test',
+ 'description' => 'Taxonomy vocabulary and term upgrade tests.',
+ 'group' => 'Upgrade path',
+ );
+ }
+
+ public function setUp() {
+ $this->databaseDumpFiles = array(
+ drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.bare.standard_all.database.php.gz',
+ drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.taxonomy.database.php',
+ );
+ parent::setUp();
+ }
+
+ /**
+ * Tests expected role ID conversions after a successful upgrade.
+ */
+ public function testRoleUpgrade() {
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
+
+ // Check the tags vocabulary.
+ $vocabulary = taxonomy_vocabulary_load('tags');
+ $this->assertEqual($vocabulary->label(), 'Tags');
+ $this->assertEqual($vocabulary->description, 'Use tags to group articles on similar topics into categories.');
+ $this->assertTrue($vocabulary->uuid());
+
+ // Load the two prepared terms and assert them.
+ $term1 = taxonomy_term_load(5);
+ $this->assertEqual($term1->label(), 'A tag');
+ $this->assertEqual($term1->vid->value, 'tags');
+ $this->assertEqual($term1->bundle(), 'tags');
+ $this->assertEqual($term1->taxonomy_term_description->value, 'Description of a tag');
+ $this->assertEqual($term1->taxonomy_term_description->format, 'plain_text');
+
+ $term2 = taxonomy_term_load(6);
+ $this->assertEqual($term2->label(), 'Another tag');
+ $this->assertEqual($term2->vid->value, 'tags');
+ $this->assertEqual($term2->bundle(), 'tags');
+ $this->assertEqual($term2->taxonomy_term_description->value, 'HTML Description');
+ $this->assertEqual($term2->taxonomy_term_description->format, 'filtered_html');
+ }
+
+}
diff --git a/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz b/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz
index 05f47a4..5343fa0 100644
--- a/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz
+++ b/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz
@@ -1,4 +1,4 @@
-NKP drupal-7.filled.standard_all.database.php {o67~
+P drupal-7.filled.standard_all.database.php {o67~
bowكd7$ r֎ZHj{/PEԅ"fxlX_Ūb/awӟ.<~x[
7Љo
(vR/I1>D| g_伸^eNq8ߺ&Cs(
h!|a^t8ЛOo0فQD/}=^s!6ݧ{r(.+_(o&Aݐyӣd[7=Dn&{}ɫϠ R/ٯ|:gfxFۼ4<7F/]I׳kMwxxn&(N7Ǽ{?D]^$ɿ&Ё?Ro0xps|(0cR8N[܋?ixh
D xn6^{Ʊşbi-Aoe4}=x5a߾5_%
{p}>;T94}lGu_O4:Z?~ 7ʇq ;$
}1,!cOL
u(xs:AOc|>?,d
Kb*į'9-aK~ՉG8᱄SeR&X9zWyDB͂ŲxW9/bNhb24g7P4Ժppc"I L=4h1oTT>x]%gEDAr$@i /QE)G0%Cx7tg78zסdp| n@|lUnj yGrKv0]-}_Ʈ~O3` } ОQMs zKoy7'`UMկu
@@ -328,74 +328,91 @@ qCL
%Wʗ'Ź]bďֈelzmw7-cSklhFB_ޛdB}E\6M+d&R'Zjq*ynΫ!'Lذv%my&~e 6s6y~E T
gEI3:5`7d L\^V~l].^ ]bA*ZmQiq_gk
L?ux`Ir6*+{0iOz|w=귟GJZf1":uJ>`u`ߞ˳hN,T
lUhnh-y74M=c?k߿SlA
pϻ8);rDBڭ-f,*!J_ӏXsFAFru K[g{hf0_X/j3[}>vpͦ)g ZbHF*퇩_>|,Ԍk6Vsfp9~$\Ct9/ˬ". ?mT>r`|o ܜK(0#ARddxNj}Es$Ӷ5o8ѭ=rف0wzs~z9R^:5:NP`DF02RU)vN/DzCu_7[jS6cp
XRܿi76M~!Zl@LQq R@'`/*.6;$hFvll+PAjp<ծ18 U{?
>%V4V$
-YIQr mX
h?P\}f`tl:|gЇ]th`U,ecD6uzmcSQ]&2#.?ocz˩{_䶍,[nlHuL]ǎLLe&RnƒR/3~@
- EZnw$8 zA m?9`hbCn灉-
1ÈGVj]זIHP =&ՂF|tȌ:6RdZ!+kHRЊp1q1p4fp3#csp/ۀ
E&3b8--LA'kږe/,1[aqK-XVg^%Ѱp4`!9'Kӷ|OsX,^-zhf.`tFs2@ c8gH7B|a@ @/xK`-cBS =>1J0kmxm3pS 8(21JWm' (F@CLܽngc3
-,s43b`a(RgBtGC?0B:!F-YBQ`;Vwl0o[s{bt(.7"Z.ҏ1koX..:7
-bxXԃuQFq 8}kθkwe8A1H
p1bt`<0@ q~Iɮbsq]A`p`o8f3o8`=`c3IB#wx:^7Ƙ;Vm
-^hXp]qwdcG..q)7McEy@rLqE $64 l%EўS`oM0n Kpb
-a0@3^ %疠@L&U`ԪqߴiYK0\ L`]3<<