bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 7.22

Browse Source 
Signed-off-by: bachy <git@g-u-i.net>
This commit is contained in:
bachy
2013-05-24 13:03:57 +02:00
parent d5097a4bc6
commit 5658794f17
265 changed files with 5551 additions and 8808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/taxonomy/taxonomy-term.tpl.php
View File

@@ -5,7 +5,8 @@
* Default theme implementation to display a term.
*
* Available variables:
* - $name: the (sanitized) name of the term.
* - $name: (deprecated) The unsanitized name of the term. Use $term_name
* instead.
* - $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

6
modules/taxonomy/taxonomy.info
View File

@@ -8,8 +8,8 @@ files[] = taxonomy.module
files[] = taxonomy.test
configure = admin/structure/taxonomy
; Information added by drupal.org packaging script on 2013-03-07
version = "7.21"
; Information added by drupal.org packaging script on 2013-04-03
version = "7.22"
project = "drupal"
datestamp = "1362616996"
datestamp = "1365027012"

5
modules/taxonomy/taxonomy.pages.inc
View File

@@ -118,7 +118,7 @@ function taxonomy_term_feed($term) {
* @see taxonomy_menu()
* @see taxonomy_field_widget_info()
*/
function taxonomy_autocomplete($field_name, $tags_typed = '') {
function taxonomy_autocomplete($field_name = '', $tags_typed = '') {
// If the request has a '/' in the search text, then the menu system will have
// split it into multiple arguments, recover the intended $tags_typed.
$args = func_get_args();
@@ -138,7 +138,7 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
$tags_typed = drupal_explode_tags($tags_typed);
$tag_last = drupal_strtolower(array_pop($tags_typed));
$matches = array();
$term_matches = array();
if ($tag_last != '') {
// Part of the criteria for the query come from the field's own settings.
@@ -167,7 +167,6 @@ function taxonomy_autocomplete($field_name, $tags_typed = '') {
$prefix = count($tags_typed) ? drupal_implode_tags($tags_typed) . ', ' : '';
$term_matches = array();
foreach ($tags_return as $tid => $name) {
$n = $name;
// Term names containing commas or quotes must be wrapped in quotes.

7
modules/taxonomy/taxonomy.test
View File

@@ -722,6 +722,13 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
$this->assertFalse(field_info_field($field_name), format_string('Field %field_name does not exist.', array('%field_name' => $field_name)));
$this->drupalGet('taxonomy/autocomplete/' . $field_name . '/' . $tag);
$this->assertRaw($message, 'Autocomplete returns correct error message when the taxonomy field does not exist.');
// Test the autocomplete path without passing a field_name and terms.
// This should not trigger a PHP notice.
$field_name = '';
$message = t("Taxonomy field @field_name not found.", array('@field_name' => $field_name));
$this->drupalGet('taxonomy/autocomplete');
$this->assertRaw($message, 'Autocomplete returns correct error message when no taxonomy field is given.');
}
/**