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 4ca882b..c58c464 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/' . $this->vocabulary, $edit); + $this->drupalGet('admin/structure/taxonomy/' . $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/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php index a2264dd..b085fc3 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; ?>
label(); ?>
- description->value): ?> -
description->value; ?>
- ', $forum->depth); ?> is_container): ?> diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php index 2122b9a..54e0c17 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/' . $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/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 @@ -NKPdrupal-7.filled.standard_all.database.php{o67~ +Pdrupal-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]^$ɿ&Ё?Ro0 xps|(񟞊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@|lUn j yG rKv0]-}_Ʈ~O3`}ОQMszKoy7'`UMկu @@ -328,74 +328,91 @@ qCL %Wʗ'Ź]bďֈelzmw7-cSklhFB_ ޛdB}E\6M+d &R'Zjq*ynΫ!'Lذv%my&~e6s6y~E T gEI3:5`7dL\^V~l].^]bA*ZmQiq_gk L?ux`Ir6*+{0iOz|w=귟GJZf1":uJ>`u`ߞ˳hN,T lUhnh-y7 4M=c?k߿SlA pϻ8);rDBڭ-f,*!J_ӏXsFAFru K[g{hf0_X/j 3[}>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@ LQqR@'`/*.6;$h Fvll+PAjp<ծ18 U{? >%V4V$ -YIQrmX h?P\}f`tl:|gЇ]th`U,e cD6uz mcSQ]&2#.?ocz˩{_䶍,[nlHuL]ǎLLe&RnƒR/3~@ - EZnw$8zAm?9`hbCn灉- 1ÈG Vj]זIHP =&ՂF|tȌ:6RdZ!+kHRЊp1q1p4fp3#cs p/ۀ E&3b8--LA'kږe/,1 [aqK-XVg^%Ѱp4`!9'Kӷ|OsX,^-zhf.`tFs2@ c8gH7B|a@@/xK`-cBS =>1J0kmxm3 pS8(21JWm' (F@CLܽngc3 -,s43b`a(Rg BtGC?0B:!F-YBQ`;Vwl0o[s{bt(.7"Z.ҏ1koX..:7 -bxXԃuQFq 8}kθkwe8A1H p1bt `<0@ q~Iɮbsq]A`p`o 8f3 o8`=`c3IB#wx:^7Ƙ;Vm -^hXp]qwdcG..q)7McEy@rLqE$64l%EўS`oM0n Kpb -a0@3^ %疠@L&U`ԪqߴiYK0\L`]3<< J0ncSC ߉To9G6&axh; Q4c \9S;[L)csP l9 L$VMlȷ ri1l;%31}#Rhg > .pC9OC\w Fh*`ݰ]]p﵏<݊/T<̓pi:vAVG&# P2['}҃+<8qywDzp ,n&~;7Ƃ @[=J O?RS FChe`Y>&Q88 _;-hCI`ξ;?q5Z1X0%ӋҦe`ZocwbJA3 -cg, ؆%OS3'>-`K \BPivӑ~;158xLJ"G#Nhx~\=OY Zґw@.1!8h[4Ddx+B<F[cLQ R7`yxxUx'l*vb3j3\tS"\zBXhD|O2Å]M87wXdT~`Q2 -fض,<꼎s0hkF 4DB;s>h1$ RZF/#6 X30+l]cf;@xƫfsdw[U1\F١J%=O;:g!طe;;еw Ԛ`ۦP@O}O0wiC+}tp/`s4u#QG0 C0~Ls/t8},M=<ЉL;(xd△xM:r -VFKkF<Ď!e`~kK z\-'8%ěJInHI/-+Rd&GG)LF(PWBܓFֺx{نGIJ#p"$CTtL.oƛp"&7ZA+eJ@/b$KdKb^ج6n3lIEAf,BIrs>7\zd"Rg(]$l~ -֯@5smjdR4@lusqj4 0F, -ƪ䍬Eگ7UPMYRH/4JULmaYf,eߏ:1uvX;+iM=ƒ\lPnήv!9Z,?cw+ mz>o` 6u dzq[2)LEA6v ƍpA -򫨧/d]d،F1`mV4J}au*;,Vq!f+wn^M[:#s$w ƃ^þ;@0yQgd;*ȼΤxRɢ^ztL@$;"L>%kr}R#'Yn؟Jm?= *u("b7ZFE'GnAw.A3z@_Y4Xg -̈]lJ(<e`"Mw;)UO0XʩI,%rtPH0"E6R-yEsVuJN!@'^]G -ɜxmXVS՟_R4vRD|(N<q> -ѱd#0 4 G}f>y*2Ljdp4cds)_>I#yx]Vfё_ ~_VI/bֳ4_ /fm\% ydٖ03IJSOOП2앦, VChQ~fsȃ9f,_g" Wh%QY]8ӋpST)anD8ff!Ja%9l8cWO~ - LH?zWk3eC@+6h -З/WK -?f)is]{Gj(:ZQnh9$G|ax(uFC 3#r*vDg&uV}R[?~v`HeJ5DBXYdW5BQVU[L,YmG223蕕t\ˏm buVVXL5PfӶ:37j <2(*QSUS-/iذj'&=)~KIs1ݦ*8Ͳp$"4"}7ۦ2n^Sm<IvQlBws|*o}-'uuϒGvMj=ӡ/4{bNVژˤZJQfbBo!g7I\]%4trVZ.-9~*cT]x\WF;hc}+7*c<Ƅ@lE7d=eWKM+x'-3ߟJofHwR3,80d#գţoHӼxF"ɂ:>rGύ*A~exI52nݕ x ^y#XG/g9Ek$ٻ {̍(e., O?βg.¯}N;M$D=чWrdTf; Sq&i=kyOȠ'#3`f R6ͯ?,Ymٯٯ>Ļ$g dK#Jp #z f>-|Q׋/,#2N;(:`vOWOwլR{]ac{an=b1R2!%F}D{ShYIkw)Z&tw%EWW8šF30I;/Kf3|&>(o1Q^%K*S&~PDb$qtBш|2/M~;YzC31b3mƾk{u -n+DiH&/FWe¤ M)wȒD! Ͷi`uP>rV=^ѥ1mG;8|I +DOm`wbQZ?n.ߠ9SDUed@&~|_qGSJ:1!9/%ɚ2mv-e֔,D)X߂Gs^:?}ҳ. +T e*4~G%L|Xk?"0b<"(č> LAm*7hw8 obrC ^>EDℽU*N9Dr3aj9"ьꔽ>#cr2IfuM[)[&jY$7ԯ֣xSNA~NMEцjYR -Gha$v좂#DL~e?h쫊24NyP BY鮔ۼm纘KfId+tY* wC*ljǒȟ/ϥTZ H_QD֔ ~J1};6e|55ה 3US/ ? e~c 5{;t>1VQn䆜W`JΦG8)#pP=^E$oJ_vųgT2|e_W'—&yo:R*f_xLA18Oi&4FyYpDIJL&1<^EU%!Gpp vۼAWH JLob&I>2лd '0)CUrCLo̶J/ ޠrEoPkN\y\TJEg,e AߊױX,[@x<:l?e²AE$5- *7*Dh5iRz%"iZD}6ũe䦯{&X*_atPMiiV2x[W ug=^bne{`Mnko-hsWdxYe/EuTz͒w. aQ}Aplz) aö}g`Zq63pQ+n;jŕ=踐T}mgolo->}x5iL݌(p|v:^YtqC]D QCJlĐ H˯)ΈQL?Ìm 2=6˨x7XdweԲdy!b-En؇E{gRof+L.Uwp[(Bȹ\\}Qm(aeWbDtJFl~\M}uHog>ANoN:s sl}p] N2 f]}0G|ۛ>\d-J\2!/SlS,\0_x^K;êos' 5EZ* ! RAΰa3aqgc,=%BryfU$7%{xof܁g9;Q4h5K"4w33+cDL%èʷ/mizfEF֕B\@-.E,)#/?-<`,1Mh=xqo%6Hsh%&gϾ:Y1-Ns$SUxr?Rqzj+s,˟ E2݇$iB{hH|K54=k\"c\K .o"Q[]*+S&R6c0\"V}l~Ց"'j?v;Pcdo&ϲ?%)x+Մ*7Z'UM6?`O9J.QyX료7mH_Ihm[5ZRI,+4vP$APplM, q)F 7|tP7/gb__gs}^3_9\-&4OjR0Tgrf31=:G~4k'^M~ksEW$nÇ繞d& -WcӀKblIv'Luw\Ԙ>硇ag`giܒ>&I78vBo8ߦ6(l -zWbt[@{xN*DH_ @p`#:(0A>n,L҈J8#T{3IkSohVāmgﳽLU)фwd;՟K%w%8lb$Rp|9 J~HE!R߶)'1AfdCـzߎ׸nE~J0C]rp KR'Iu87IV5de̜R#vu'Tu)T']0nM7A>(#ȾD>!765w= ̐=+}G-O KBl{`hk4XOjA5 -ISy|ۣRV%xuaAI~HE瘜"0č-_^qkSlYyE]A֋y`XB6GXI/&-D|ʞ=J`k,U{SGw1cc%2a.\QA oHs@7f - J3#vs' ¦S j=?X=˻dPf(7_r+}idW#ͪ!z( sW8bfG)O=R8U2e 'R 0=_.Ei,`.v%^@KqhH~R[V%~8pՃT CR-Niـ LTA? /{[F_-Mv,D̅|8o^WU,!_ -7RzC$ !|TEW`'UanGN/]w#oT4Y*QHW9w- - -e'`H*31Fh -;.PW&}{oo!, lWJ͠׈/:, -Ú.+*+JmJwKm$0tu;p\~3g-ueGcgi%Y!)\Ud U|8ão9/{>tpsa[%ȓly"gm-,"l[{0V[4dEۍ +~W"+>gK bmۈ^dPa6t' ~O6 Cy1+65H*h=+xZD e -gH&U1V Bt\$ 7DɘV4F%GT1-lÌH nܒ󌜸,鮯},P08ЅFElr^ #/e0 - Avѹ=>g6vv-SScU?]K fŲ6 ㋿ZOG_鄸~`juZQ~|8e/G4_HJn& VY/tr-`Z.4wq:V5rZu{+i3jƹ䘬u[dǫI6W991k0lUEƘCX5K.gaV5[=WhHAvÓ+5 - ^re -@ SLj /Fqc{[$~>\Җ 2(ҳ˗>0Bh2K~ 6$|ŀ3IL5;S):2s"6{DŽoMi3ttH>.yc;)>NZ\w97^2rعFS_71A`1P+4kh;7p$tˁ5G8#jX%sRòaL-whQ a}edŕdMtS/F)KU,Brp[=*fXr!I/K$?A 廆(?ֲ 2hP(M$4==|m@F /F"yS2:Cj[f"S/y)1k>-\(ӌNy<|I9mw;?fkAvOej sN*y\3/I^ξW'•+Wĕ+WRUx׉[1ĭZuVi :q4sUkNܪ5\'nJë $,rڐ$4- hKB5ڒ$4- hKB'n՚kMc׉[1ĭZuVi :q4tVi :q4sUkNܪ5\'n՚|jMc>׉[1ĭZuVi :q4sUkCxXkNܪ5\'n՚|RmumHhpy[іo%mIhpF[і_%jMCC71ĭZuVi :q4`sU[:q4sUkNܪ5\'n՚|jMc>׉[1ĭZuVi :q4sUkNܪ5xP'n՚|jMc>׉[1ĭTi6BkzՊ:iG{ў:iG{DԵT"CF !]#Ձ@d׈d'@df4u 23j䡌6p@CcFZИ445 ؚhlMCC2![10uLD`vS=!]jOd1ZXq@df1uL!e"f: Qw@CcFZИ445 ؚhlMCC2![1ѐ :P{"C0)Ԟc -'2luLD`FS=>ѪQj44f5 iMCc>ZАih44$ckPk:P{"ҷ=!X]jOdf1uLD`FS=!QjOdf1i͌jnrwy3o ?fQ+Һv`^!52A -Ҳhs"jR\ֳKM -+V&y|a9؝~夸{~m/b|Jd+IdEKnكqxC&ՂHu|˱E8֙k*U >|Vō[GwD73^tlVs@ 7ߋ! r(ޙM+#> -bu)|Ӈ7ozHZF CfF4J_їq5p(]֫md+uɪ5Rc ]wQ-jӥ4% [{kxJ]rE Қ4ԥANkKRZm5֠ѥ.Mjw.1]9RD$-njAS -rܬ[u;io閫-E+n' -n)sS͒0X[5W-nYfAXN亩fQuVc"cR*̺QVc:RjY7 &XNZSͺ0D閊W0̺0їUtKA[j6Y7@j)xKΰFCV WYAf#utLA[Q`[4ס1R6`G/ԡ1QoVXG阂,n.#utLEܫV`0#utLԬn2FXs:1BqfwXuԏmCc -毭fyXV~|H:SaX TG阊W<חutLEܫYՠ9RNTĽa׭K?4p)5î[ Qz<\NĽfy8uҏyCgUYv,n5X1#utLA;jshajK#utLA;jsn9RNTP6V"o)5é[ ~Ƒ:t:",n5X1#utLv,n5X1#udܨ{59}\N -q~G)& ߝ" mFtSo앶TԘ,ȓY\_)zq+NgVήvm0Ij ,$:_)W -!T_ی?SyYa; (eWT|&'Nb l,'NeO0*֖JO ~nJ HkuF[ %Zb AeupoO)GkGŵȉE~7P.<6ƳJW&껑g6+ś q&癥s؁okvVq&jm&c#R)>XlK"Cg񠅇yǧl5y0z\f.eYd`K4oawbeF1xCߡp/2 IGzo -Wq*6ʷkJZ%Wz[ ˀdj[}1B?S+v+խq;V̜ԢM{0T53{YT{)^ J/홥J^Z:[E/ tJ/J]+^z tJ/ݙJ]+^ c;\^gv/+wAܯ*z9i襇қ{Y b^u';x*gv7+wi-y`TU9ݬ^e%D2&A.Guʞ6@J1Ռ sf0: -d -ZQ2L͡. nЗm2LbJFiL}F 6F&^L%tfyT -d"Ċ1$ӝfRB'$+XJfdkT27j:!Yb2L&X5dz3SlQdjLbܘJL}F (ɀ2c*PdfQ5 -`GYMvESɐF3SߒQd[j,bXJe,}[FS B% V"XfVRB$7Ηm,R,{fR5 -]p,E&["dKYҷj:!WT`1Jg$TR7GR{MWqviaٰŪ*\.ͣi$~޴C )UfRj,NLMlݍI?XoKE m9rzg9/y?dĵFr9-NVZ^jukRK~/Nz"]f?e댙b\m?fb:O:WYp%沮SfspYb.9OtH>}p~LK s6V9 ,Ly׋'8|,DZk>.E:qLS_ *DC9=i\Z\_qB鞙|"@<3h4Ѣ]ȗ - jKZD}gt |HtbDǟ'!4Gmu  Qd2@4_L&x0eB_25R<0eb_27R]0e_24i8n!aDSTe)mvL8LVj15Z/;LR_2d6Z07r -K&z&+Pfc{QaaDlRׅo-2PՅLHNHJF lj?eY] eKT*pv)[&F lo(Ƿ:yRQJ9)3vNI)QJ9cvLJYR -)I)QJhI)QJ#Ȥ(\K;2)e7J)r;LJٍRʵN.#RvrHPRuN#C5J)P?| G&F)'G&F)z^'I)[.jCLS&lYe.;BZ&Ȥ-ٞTRj6Z*2ړJZI/G"i=IrFjZOk(BiORM7ztL9rIHIe̱zvX&~&Iʤczܽ2iBkOR&G^^K:!$U߽Ri&7I{Ri6V{mf7<8S4֙'gǬ'hYw̓JEokSd۪{i"p :8i_m}iuM\5yu'.ﮢz&")ӳhl9IUS(δ ux+X,#Nd\7v`q]lcԖh -pAZeo.Y.h?_%sInߥyY-H.kY$KTyKMJئdoTd{ſW(_-)_Hq~v ?BŁ8cXo\BSuKLJ-[9Z|+DŽ>fZ.*V+m7‰2#spU G܏rG!??}x2|;8j0)QE}u #Chև0滗oY;y>~~pd_{۷'u6XoWEi>έR z| b|<)+I?1 G1s:((h"_~_ٻ۵O?G;&}y㥿{YH0b"e[e?fVMvpP9OhV??ߚ.o_x}gO>_Oz<͓3*cė<\dTΓ%~^<엩>ݾz}wɼEɯOaͯw~T'kyDĕ<\TΓ-?҉&Yo~J^?o_-q__2ߒx&3-d4O_&`/;y:<'G4OoG׿=>oF~_/Zb.4yꙿ^ힾ nVB~ui<.3ė<\!ZΓ+^}s.^}v7Wv{m}}=͓;<T٣xtL~T"c V+lQDQjJmn].̋zq O -QThOZ RFF*Ȳ}R׮=[JufPfu\m6rEAT] ?f̪ VU -z_9ERO [b0,iB JFFI$`3ۧ_Fӏj(_ѩl&(kC 4Tz=0!n[5x&I/?ynuO_Yϟ?|(8 q- rpL&lmuhщgVݜfVԽhmLUrF^U/X<:Ax>(@^ϮE0߯=&6%ș[]ƲRe -4c=t,].,,ͽ`@y叠(L}D=~aBfڇQ~TF":c }oIh h9>(w Rz^b)tit!#i~ƽBTJZVIiM'ؤ^V&Uq XF4ŕ!睑-BQmfapG-m' -W%H]śG-qj[S溈G(%T(H5JgfG?QZj*l/Z?EW1o+=8AK<Nplx^?8 uR0p0!/0 o;cLar܉ |_o> +Fa͎cftʹ&n9[Gߤ#WiEh9x.nMx.RfР=j: xU) )IT%|"M@J4܆v((uJÚ](STÛ{q7Zm50ЛXC'B2>q`v}31bxj/A+`&K.^P/(y1cJۻM|HajW$uZ:+"XzB^]7D[zd,R0D$l~ +/A5smjdR4@lysqVj*5 0V, +*䍴e>lJ(ϋ,)[$V%Leh2r245ǵa̩{$jkg% pGX  ~򳟱:Vy籒ӏ.w`s_)J%[dc`S8Ȉ ZSCKB& llg"Tot֮:×r+YpXQswBtY&%:dp^={ڮfV ZQE>k#`ar7R9q^"a+p${$>:T@`sV}HoSpaOۻɰ?P=b l۾7 ips?¤;ꎵW(ב!f+wn^M-|;V\AA_]C d}TdNgRMIa/=iz& ]S}n=&5>~7~OXz6ܺ-hkpG@#“#v7;^{;ӏ ? = +/沬: 46)"3bz|[* :EQ$rHNJn1: rj+{IbX>RkԩrzKfVAiќcbA}z-Wqב¹@2'=ڦ;2V5ԭGc?cM} t7B/릏Bt,Y.ɣuP O%NTmIJ6O=mx0 ۮ7n/?a; !dN]=X=E<]idD6XנKӒU&͈mM$KC(ޚӨ,kB$ P| +3M%z#K=+IYO1U$[‰3n4p3Ñ@_dfOJ̷1F2 X+iLDD$}ŋYֱ/Co}WØ,s.V=|) S$_֠^i̐PjhY>g69<Șqh" +~ƞ/}rZ)5 lh3xyFm>cڹ+:V8φS:wDa;g긡]xUxߛ9S6bsY`}BH}9n6;>ٵw|$VEhFFJC8ߺyĉ6aRl;r2=9"7tItvo>ڄ'jgw ƍTxq\J$JvU,eފPOSv/#;'k_^YI'˺ؖ80Wg%j%Ue~މ;m3syf>@-C^+"4OE0)\e8RS|HCƆML_;U?1IK6_JzkDg?(n#{#ʜͱ9f`in}8?Mp~-nID,~*cL<8o#y6*/l7;vy4o0gc@p8hVX7R\"6eXNiL$)D). WQjHmٵ0be¼P:}g&m9{lż|>zoR}ay3\vҍ^Wƴψ~Xō$ԢT2+ +~ =sIZP*U _2iQFOr\؎Qvs^1AɯܨTFifg }_.-[|7d❴0";̀JK%N#aIQΨ>dzc.^8WN/%?LQ$" .=7V6} SȸW74x'~7x"\`%_f,:Z}}I䬉Q0Ix4"KuЌL%{DL&cϵ'u rn+DiH.Fe¤%хM>)wȒD! wi`U+c[)҈`B;8|eI +DOnabQZ?m/ߠ9SDUed@&~|_sFSJ:1!9/%ɚ2nv-*e֔,D)Xz؁Gs^:?}ҳ.} +T e*4~O%L|؀k="0"<─0> L՝Am*7p8 obj}= ^>ED┽*NΨDr3ej9"ьꔽ>'cr2Iu3źx&\ ^y-b,z WTTqҚ("faffQWQ| j +S%ǩ|clÎ~/޽cN?5:qߐ":0L4zgQ.BI3Dһ.!5HBSlv>ON/$7}/3R#blNK(۪_ݠ(]2bv˵u/ۃsnr[+ll@.P<*J|L/˃ksId;jilvmTk &@zòm 9rmfVJ3)vnK{q![?209[,·Ϗ}D/kx=aR$au~w ɷT0؈!fKA]S:~^P/ezlQ)4n_Bh![t!N +e{gRof;kL.Uup[(Bȹ\\}Ym(aEWltJJl~\M}uHog>ANoN:ssl}-p] N2 f彽~0G|ۛl>\d-J\2!/SlS,L0_xog^Kêo+s' 5EZڿs! RAΠa3aqgc,=%B|yfU$7%{xof܁g9{Qf4h5KuE;m"ޒaT64="#Ji!@. [xV p^ }*C:ߙ%A?F9 ;l41'@lf jZRhr iqZ&“[CO8h%/&̯1 Y=@#/q V?|~p;b.Iwf/?p̿6QLJؚ"WYџ4A[qVjrG16 0M^dELx*CO#jwxWss]=JZ0Ma<}RMry%YRմ>xtiU?i"s(DY/o#b2!}%UI3zlhE'ILֲxCM6B=^r7Y0XI֧=f2ʧ'B4݊}u`,?^"| fg(p6Ӭ>uH~HPߞ*˙ +π7|;&V:)Z]Ҩ˯VRx5ͮ%] $gz-k^=:3C0" +O&t=1}CK!Zla3B l%}Ln>p셔pKQDn"">&UN*DH_ @p`#:(0A>n,L҈Jͱ8#T{3NSéohVāmg{Ʃ6 KR'Iv5875dUĜR#vMD>'Tu)T']0oM~6( #HD>!76f5fw= ̐> }G-O KBl=04G5sALorG iuC Km )<5߇(6DF1?8@rXPvDa9&7Ql˖װGZj>Gpg^:dlEbbXi#Uȼ\ EۛD]^~nJItpȧC_?H97Uq36V!o} dV2h4w4|2/hv145bxoﶗx+.l:Ш ѓ MAe&±x#N*Evy-W|p">rC$,T8ӯ +YNCnÒ4B&_ЂGcTQl,=9? Y +ힼQҤgD<]ܵ( ڿ w m|()x^@]emW;XtvK3_  +7^#NZLTR@Otz[kZ؏&,/?,_*6Y*%=,XW;'qlL!0-1n.7,B#ġ `#}o]^2Aѐkm+QBS7Pc!˄uMoAZ ]3E4a@G`Vq@$>?݉ӕN}e|'X,0p_W6( ˴ti[etRO,'yޮܨT]I:;`$02o_t5I$RLM9 ,ђmA"|zԠn/1_^&%]9%0jN*ѳX>8,ߚDe,۞|tkY8lXڣj3)ka39C|t3E4z UAghMoA1{Og ߬E8(Ng3T|vF8c`hep_Q +fghg lg{N3\(p@A)5XzA%>ci%Y!)\氕d |8ão99/{>tp3a[%ȓly"gm-4$l[{0V[4dEۍ +a"+>gK bmۈgPla6t' ~O Cy>+6$Oh=+~3ZDUgH6ڗ1 Bt&VܔPpRg~57Y%s"zD/;_х*gyLZ;]Hfe ҷl5&-.̛z=w#DL+/qZrjQhF[2T9SV!S]-,,!*NJǢ+mh]MeŹQib(A E'-9Yabd(/Ìc2-[X*frK͢r(LxRꞄ0@>/xnK9irb5Ny;EY*ݬݲ(ŷ0A_g;XxƭNZ_ +ڶtIcեmOhv -?=NJ^o6>.y;8T:=^ W|cK"Jin|:d>GH)^7"q.6 )RAY3|'AR gjyз YseF<-wlOcW= P~ZfX:N2f]̘A*n9 C ^-bsj8Pqىʙq0Gz>Ufy-yOʬ &kDV 0ȹmInFOrC|`+~~:6I螓Q[6-j/:bHh.`J _N Rl*sN,vǨΞ~X3s /3A)&BWO>qxQƻ$OBR8or~GZʦm!#HCtu6W)x Bh69ߊȶr(5ƻśmQލ[Ryr)7|G%iQI䴴eiBF Ji2LNKҬ_tszyxda6=_*mox>aT +r#-I i5l ^1le. ,Kx:yاzʦE,]썳kL"ܫhvDr#X)/Qq]~Yq}C 0{BjO͵koYNܝL8~sOr`M,)Hj0aIkeܨаlu+4e}pJx_aye)=f@j&gRmABϠ$$Y:dem*B5 :eGO_Bٮ!1hᠢ-lùL#Jx MshMφ%q.}.;@ǃѠH^%Ը|oEqږK^.mJl̚Bmq 4G4S$ /1 nqGCO[hvd]fְz8b 57,pu"\Y +p+M\ +p+\%빏Ǔ4ZY`>dmn<WĞi _m\!`ǧaB~ 5=5(UP1Ta~$NOna.*_uƈE1Yn=ml6pOpqND˟UOPyΤL¯\FiZz)FE9vMO@k# ~8p֧LO 5! + +l򿳖#F6*G[fgERittEaWjל9a8qJ`\V5KemTx/-^W(-}|ʆ o ?܊\>nQ *kMkl1I$aOĸn$&'1DW4`ps7`qs4#\n|n |n |n |n |n |n|na|n|n|n| | | | N|> $Lo׉[1ĭZuVi :q4sUkCxNܪ5\'n՚|R1 $!mIh0G[іk%mIh0F[|іNܪ5 ך jMc׉[1ĭZuVmiĭZuVi :q4sUkNܪ5\'n՚|jMc>׉[1ĭZuVi :q4h%:4sUkNܪ5\'nJë $lڐ$4- hKB5ڒ$4- hKB'n՚njMc׉[1ĭZuVi :q4tVi :q4sUkNܪ5\'n՚|jMc>׉[1ĭZuVi :q4sUkNܪ5!<\'n՚|jMc>׉[l+לV+ў:iG{ў:ih:QR 1D`v(V"CF!^#՞F(!Q#ԁ̨jR&2ژBv,Cƌ1!ihGk5 ؚdlMCC0c +'a +'2B :P{"C)Ԟ c +&ց̨c +'23BD*uӯFCcFZИ445 ؚhlMCC2![1ѐ :P{"C0)Ԟc +'2luLD`FS=>ѪQj53ҚƄ1ih44Dck5 S5 S= ۞c +'2B :P{"C0)Ԟ̨c +'23B퉴fF[7߼{O05i] 0 Bk?Y^Iрu_Bu5?.'6]nml>U s]j5oX)})_%DztD?Ë>/l:^j5YpA'AҦ:3 d_oޤ3ך}15nKTSg7[8_z*uxGth6y'f0r=2/,z*뫝>܆6(]4'VKm'?}xoK74ɪ4ɬ/ a(@ 7/%wka0o֏t>6ʤAVAvk}KRlQL.5֠%xJlaJlYjAK]+u5Hkkx&J]dt.yǻU44^c ]Ҵ%W% WK5htgʑR&iqSc :RfҦmB[BV[U#`=YUtKAUKBҭ!0UtKAUkb"V胰 +n)ujQxnU O[UhtߎujUHU5 +<}jB[*jYLݪSjB[ +VY.$ݪSjB[*jaHU5 +n)xjcdFG_U6 陂)v쭪`GUgcG陂)\TE좹)Vj/!#uLA[UCֳ@[%ԡ3oUS[UԏCg*RjzU5L :tzևgUہJϚ HbV|0G陂!llIj~H:=Sv̮lw~n5OI9W2VP1YE+ ۹x?OSs,W쬒]jۤb͙ŋy҅YTIu_)(q+pT_d)lATɻOJB`r5ut铘Lep/f/zG +]E87N?ӏ.seN?\eN?^ӏ[t2!y:E\!HsFrt 57R5K) J\%aЬ!]y#A؃Pq*Q9Q|g*AxPV eپT'2UL{ +V@޾TE@Od2Ĭ +T@OQêLU +`U@OdR'2U))\ƫ&S=J~LU +D*z"S=pR'2U)艌?pzdRqU +Df#pa<*MF#8Uo2Da2S3o>UY&Շ6/@B82h_5쨦"MQ ag37B%MGˇ@$:hz#_ #`9فai|H':$l?եǹfBEquf._މ]<X E59,K`T"PFobu4Weg&_'y{LklM\g4Uh.mKR9Qs%DF3r:u>QWBn$:^At"!4Gmu }S Qt:@4[L&޸x0eB_24ijM.”~Hv."” ~$Ӵ])MRɦL|HȺELX23Yhcd2Im~hؓETX23Y2{2uLD&7t[K&f>Tu!+RfuFRQ9=)[*cYVHR)ը +ݺ@ʖI)Q&;)[5 +GNԻkR;:AJ&F)]dRjR1;AJ&F)S;)I)QJhI)QJ#Ȥ(\sɗvdRnRvkk;\LG&F):v'oϑF뚝/GjR~:@LJٍRO;9#LJٍRʝL:yLJr)gb2 eO%azX#˯iLZr!IHIJ%k{RK. i=IĚkr*ۓI.gk{t"$tSN^ˤ#WۚX&Kn^ȇgBzܞL9Z{-f< 'IʤzҽRi&Ni=I4szuTɍ#BzڞTz=k4;b퍳T)gfwl"gǬD*TͳD*њ}&cH_c"V}<(<ϓx}$?\CG/IT( = Ò +lfd4XacdAMxK8]IDH.UWH7D.KT$}oӵ_Fl<: A/ +Dxsꢃ"=!Psmr]/-d}|$wƋږI+rGc{r}[[ǵu/;/F?~YՇJ`Lz M?H^< +@M)UWUQZ¼W}0PyE.R LwkQ}a؂?^k^`Zʕ-Oēb+-quU`>e,t{:&w0IōkR)(yU75aM"X*wqrUW5@ÏU4WovF`Dd#S hu7qG&TmCOoxMe{+3f'𖴏##h!!{׳OK›TI +Ru(iY'K5`zZh 6 +ౌhT+#C;#[,hh[x٩IP؍ KP؍)G*V撤Cd0Mvb$mҠYsl0a N ȕZP>m' +%H]GG-qj[S:뇫0%T(H5gfG?QZj* Z<e56^cH=: \ No newline at end of file diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php index 167befa..4e904df 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php @@ -34,13 +34,6 @@ public function form(array $form, array &$form_state, EntityInterface $term) { '#weight' => -5, ); - $form['description'] = array( - '#type' => 'text_format', - '#title' => t('Description'), - '#default_value' => $term->description->value, - '#format' => $term->format->value, - '#weight' => 0, - ); $language_configuration = module_invoke('language', 'get_default_configuration', 'taxonomy_term', $vocabulary->id()); $form['langcode'] = array( '#type' => 'language_select', @@ -138,14 +131,6 @@ public function buildEntity(array $form, array &$form_state) { // Prevent leading and trailing spaces in term names. $term->name->value = trim($term->name->value); - // Convert text_format field into values expected by taxonomy_term_save(). - $description = $form_state['values']['description']; - $term->description->value = $description['value']; - $term->format->value = $description['format']; - - // Assign parents with proper delta values starting from 0. - $term->parent = array_keys($form_state['values']['parent']); - return $term; } diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php index 815c34b..2794d69 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php @@ -50,17 +50,12 @@ function createVocabulary() { * Returns a new term with random properties in vocabulary $vid. */ function createTerm($vocabulary) { - $filter_formats = filter_formats(); - $format = array_pop($filter_formats); $term = entity_create('taxonomy_term', array( 'name' => $this->randomName(), - 'description' => $this->randomName(), - // Use the first available text format. - 'format' => $format->format, 'vid' => $vocabulary->id(), 'langcode' => LANGUAGE_NOT_SPECIFIED, )); - taxonomy_term_save($term); + $term->save(); return $term; } } diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php index 705ff60..c57871f 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php @@ -286,7 +286,6 @@ function testTermAutocompletion() { function testTermInterface() { $edit = array( 'name' => $this->randomName(12), - 'description[value]' => $this->randomName(100), ); // Explicitly set the parents field to 'root', to ensure that // TermFormController::save() handles the invalid term ID correctly. @@ -308,11 +307,9 @@ function testTermInterface() { $this->clickLink(t('edit')); $this->assertRaw($edit['name'], 'The randomly generated term name is present.'); - $this->assertText($edit['description[value]'], 'The randomly generated term description is present.'); $edit = array( 'name' => $this->randomName(14), - 'description[value]' => $this->randomName(102), ); // Edit the term. @@ -326,15 +323,6 @@ function testTermInterface() { // View the term and check that it is correct. $this->drupalGet('taxonomy/term/' . $term->id()); $this->assertText($edit['name'], 'The randomly generated term name is present.'); - $this->assertText($edit['description[value]'], 'The randomly generated term description is present.'); - - // Did this page request display a 'term-listing-heading'? - $this->assertPattern('|class="taxonomy-term-description"|', 'Term page displayed the term description element.'); - // Check that it does NOT show a description when description is blank. - $term->description = ''; - taxonomy_term_save($term); - $this->drupalGet('taxonomy/term/' . $term->id()); - $this->assertNoPattern('|class="taxonomy-term-description"|', 'Term page did not display the term description when description was blank.'); // Check that the term feed page is working. $this->drupalGet('taxonomy/term/' . $term->id() . '/feed'); @@ -421,7 +409,6 @@ function testTermMultipleParentsInterface() { // Add a new term with multiple parents. $edit = array( 'name' => $this->randomName(12), - 'description[value]' => $this->randomName(100), 'parent[]' => array(0, $parent->id()), ); // Save the new term. @@ -432,7 +419,6 @@ function testTermMultipleParentsInterface() { $term = reset($terms); $this->assertNotNull($term, 'Term found in database.'); $this->assertEqual($edit['name'], $term->label(), 'Term name was successfully saved.'); - $this->assertEqual($edit['description[value]'], $term->description->value, 'Term description was successfully saved.'); // Check that the parent tid is still there. The other parent () is // not added by taxonomy_term_load_parents(). $parents = taxonomy_term_load_parents($term->id()); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php index 0a45dd2..11733be 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php @@ -85,7 +85,6 @@ function testTaxonomyTokenReplacement() { $tests = array(); $tests['[term:tid]'] = $term1->id(); $tests['[term:name]'] = check_plain($term1->name->value); - $tests['[term:description]'] = check_markup($term1->description->value, $term1->format->value); $tests['[term:url]'] = url('taxonomy/term/' . $term1->id(), array('absolute' => TRUE)); $tests['[term:node-count]'] = 0; $tests['[term:parent:name]'] = '[term:parent:name]'; @@ -100,7 +99,6 @@ function testTaxonomyTokenReplacement() { $tests = array(); $tests['[term:tid]'] = $term2->id(); $tests['[term:name]'] = check_plain($term2->name->value); - $tests['[term:description]'] = check_markup($term2->description->value, $term2->format->value); $tests['[term:url]'] = url('taxonomy/term/' . $term2->id(), array('absolute' => TRUE)); $tests['[term:node-count]'] = 1; $tests['[term:parent:name]'] = check_plain($term1->name->value); @@ -118,7 +116,6 @@ function testTaxonomyTokenReplacement() { // Generate and test unsanitized tokens. $tests['[term:name]'] = $term2->name->value; - $tests['[term:description]'] = $term2->description->value; $tests['[term:parent:name]'] = $term1->name->value; $tests['[term:vocabulary:name]'] = $this->vocabulary->name; diff --git a/core/modules/taxonomy/taxonomy.css b/core/modules/taxonomy/taxonomy.css index 1f80d52..543666a 100644 --- a/core/modules/taxonomy/taxonomy.css +++ b/core/modules/taxonomy/taxonomy.css @@ -8,6 +8,3 @@ .taxonomy-term-divider-bottom { border-top: 1px dotted #ccc; } -.taxonomy-term-description { - margin: 5px 0 20px; -} diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install index d89b89c..e217082 100644 --- a/core/modules/taxonomy/taxonomy.install +++ b/core/modules/taxonomy/taxonomy.install @@ -59,18 +59,6 @@ function taxonomy_schema() { 'default' => '', 'description' => 'The term name.', ), - 'description' => array( - 'type' => 'text', - 'not null' => FALSE, - 'size' => 'big', - 'description' => 'A description of the term.', - ), - 'format' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - 'description' => 'The filter format ID of the description.', - ), 'weight' => array( 'type' => 'int', 'not null' => TRUE, @@ -335,3 +323,93 @@ function taxonomy_update_8006() { ->execute(); } } + +/** + * Create new field for term descriptions. + */ +function taxonomy_update_8007() { + $vocabularies = db_query("SELECT machine_name FROM {taxonomy_vocabulary}")->fetchCol(); + if (count($vocabularies)) { + // Create a new term description field. + $field = array( + 'field_name' => 'taxonomy_term_description', + 'module' => 'text', + 'type' => 'text_long', + 'cardinality' => 1, + 'locked' => FALSE, + 'storage' => array( + 'type' => 'field_sql_storage', + 'settings' => array(), + ), + ); + _update_7000_field_create_field($field); + + // Create instances for existing vocabularies. + foreach ($vocabularies as $vocabulary) { + // Attaches the description field to each bundle. + $instance = array( + 'field_name' => 'taxonomy_term_description', + 'label' => 'Description', + 'description' => '', + 'entity_type' => 'taxonomy_term', + 'bundle' => $vocabulary, + 'required' => FALSE, + 'settings' => array('text_processing' => 1), + 'widget' => array( + 'type' => 'text_textarea', + 'module' => 'text', + 'settings' => array( + 'rows' => 5, + ), + ), + 'display' => array( + 'default' => array( + 'label' => 'hidden', + 'type' => 'text_default', + ), + ), + ); + _update_7000_field_create_instance($field, $instance); + } + } +} + +/** + * Move term descriptions in {term_data}.description into new field. + */ +function taxonomy_update_8008(&$sandbox) { + if (!isset($sandbox['progress'])) { + $sandbox['progress'] = 0; + $sandbox['current_tid'] = 0; + $sandbox['max'] = db_query('SELECT COUNT(DISTINCT tid) FROM {taxonomy_term_data} WHERE vid > 0')->fetchField(); + } + + $terms = db_query_range('SELECT t.tid, t.description, t.format, v.machine_name FROM {taxonomy_term_data} t INNER JOIN {taxonomy_vocabulary} v ON t.vid = v.vid WHERE tid > :tid ORDER BY tid ASC', 0, 100, array(':tid' => $sandbox['current_tid'])); + + foreach ($terms as $term) { + db_insert('field_data_taxonomy_term_description') + ->fields(array( + 'entity_type' => 'taxonomy_term', + 'bundle' => $term->machine_name, + 'entity_id' => $term->tid, + 'revision_id' => $term->tid, + 'langcode' => LANGUAGE_NOT_SPECIFIED, + 'delta' => 0, + 'taxonomy_term_description_value' => $term->description, + 'taxonomy_term_description_format' => $term->format, + )) + ->execute(); + $sandbox['progress']++; + $sandbox['current_tid'] = $term->tid; + } + + $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['progress'] / $sandbox['max']); +} + +/** + * Remove {term_data}.description and {term_data}.format. + */ +function taxonomy_update_8009() { + db_drop_field('taxonomy_term_data', 'description'); + db_drop_field('taxonomy_term_data', 'format'); +} diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index e10e9ea..982e9dc 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -157,18 +157,6 @@ function taxonomy_field_extra_fields() { 'description' => t('Term name textfield'), 'weight' => -5, ), - 'description' => array( - 'label' => t('Description'), - 'description' => t('Term description textarea'), - 'weight' => 0, - ), - ), - 'display' => array( - 'description' => array( - 'label' => t('Description'), - 'description' => t('Term description'), - 'weight' => 0, - ), ), ); } diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc index 72c1fb1..dc64278 100644 --- a/core/modules/taxonomy/taxonomy.pages.inc +++ b/core/modules/taxonomy/taxonomy.pages.inc @@ -67,9 +67,6 @@ function taxonomy_term_page(Term $term) { function taxonomy_term_feed(Term $term) { $channel['link'] = url('taxonomy/term/' . $term->id(), array('absolute' => TRUE)); $channel['title'] = config('system.site')->get('name') . ' - ' . $term->label(); - // Only display the description if we have a single term, to avoid clutter and confusion. - // HTML will be removed from feed description. - $channel['description'] = check_markup($term->description->value, $term->format->value, '', TRUE); $nids = taxonomy_select_nodes($term->id(), FALSE, config('system.rss')->get('items.limit')); return node_feed($nids, $channel); diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc index f0818a6..48feabc 100644 --- a/core/modules/taxonomy/taxonomy.tokens.inc +++ b/core/modules/taxonomy/taxonomy.tokens.inc @@ -29,10 +29,6 @@ function taxonomy_token_info() { 'name' => t("Name"), 'description' => t("The name of the taxonomy term."), ); - $term['description'] = array( - 'name' => t("Description"), - 'description' => t("The optional description of the taxonomy term."), - ); $term['node-count'] = array( 'name' => t("Node count"), 'description' => t("The number of nodes tagged with the taxonomy term."), @@ -107,10 +103,6 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options = $replacements[$original] = $sanitize ? check_plain($term->name->value) : $term->name->value; break; - case 'description': - $replacements[$original] = $sanitize ? check_markup($term->description->value, $term->format->value, '', TRUE) : $term->description->value; - break; - case 'url': $uri = $term->uri(); $replacements[$original] = url($uri['path'], array_merge($uri['options'], array('absolute' => TRUE))); diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc index 679deb5..a1ec0fe 100644 --- a/core/modules/taxonomy/taxonomy.views.inc +++ b/core/modules/taxonomy/taxonomy.views.inc @@ -126,20 +126,6 @@ function taxonomy_views_data() { ), ); - // Term description - $data['taxonomy_term_data']['description'] = array( - 'title' => t('Term description'), - 'help' => t('The description associated with a taxonomy term.'), - 'field' => array( - 'id' => 'markup', - 'format' => array('field' => 'format'), - 'click sortable' => FALSE, - ), - 'filter' => array( - 'id' => 'string', - ), - ); - // Term vocabulary $data['taxonomy_term_data']['vid'] = array( 'title' => t('Vocabulary'), diff --git a/core/modules/taxonomy/templates/taxonomy-term.tpl.php b/core/modules/taxonomy/templates/taxonomy-term.tpl.php index 6f6cac1..4422f59 100644 --- a/core/modules/taxonomy/templates/taxonomy-term.tpl.php +++ b/core/modules/taxonomy/templates/taxonomy-term.tpl.php @@ -5,11 +5,10 @@ * Default theme implementation to display a term. * * Available variables: - * - $content: An array of items for the content of the term (fields and - * description). Use render($content) to print them all, or print a subset - * such as render($content['field_example']). Use - * hide($content['field_example']) to temporarily suppress the printing of a - * given element. + * - $content: An array of items for the content of the term (fields). Use + * render($content) to print them all, or print a subset such as + * render($content['field_example']). Use hide($content['field_example']) + * to temporarily suppress the printing of a given element. * - $url: Direct url of the current term. * - $label: Name of the current term. * - $attributes: An instance of Attributes class that can be manipulated as an diff --git a/core/scripts/generate-d7-content.sh b/core/scripts/generate-d7-content.sh index c171271..be9b4d0 100644 --- a/core/scripts/generate-d7-content.sh +++ b/core/scripts/generate-d7-content.sh @@ -141,6 +141,7 @@ for ($j = 0; $j < $vocabulary->hierarchy + 1; $j++) { ++$term_id; $term = entity_create('taxonomy_term', array( + 'vid' => $voc_id, 'vocabulary_machine_name' => $vocabulary->machine_name, // For multiple parent vocabularies, omit the t0-t1 relation, otherwise // every parent in the vocabulary is a parent.