Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1599618 by droplet, yurtboy, Albert Volkman: Fixed Remove duplicate array keys.

merge-requests/26/head
David Rothstein 2012-07-29 22:27:34 -04:00
parent 41f11d40b2
commit 8bd1079972
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/book/book.module
View File

@ -528,13 +528,12 @@ function _book_add_form_elements(&$form, &$form_state, $node) {
'#collapsed' => TRUE, '#collapsed' => TRUE,
'#group' => 'additional_settings', '#group' => 'additional_settings',
'#attributes' => array( '#attributes' => array(
'class' => array('book-form'), 'class' => array('book-outline-form'),
), ),
'#attached' => array( '#attached' => array(
'js' => array(drupal_get_path('module', 'book') . '/book.js'), 'js' => array(drupal_get_path('module', 'book') . '/book.js'),
), ),
'#tree' => TRUE, '#tree' => TRUE,
'#attributes' => array('class' => array('book-outline-form')),
); );
foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) {
$form['book'][$key] = array( $form['book'][$key] = array(

3
modules/file/file.field.inc
View File

@ -627,10 +627,9 @@ function file_field_widget_process($element, &$form_state, $form) {
// Add the description field if enabled. // Add the description field if enabled.
if (!empty($instance['settings']['description_field']) && $item['fid']) { if (!empty($instance['settings']['description_field']) && $item['fid']) {
$element['description'] = array( $element['description'] = array(
'#type' => 'textfield', '#type' => variable_get('file_description_type', 'textfield'),
'#title' => t('Description'), '#title' => t('Description'),
'#value' => isset($item['description']) ? $item['description'] : '', '#value' => isset($item['description']) ? $item['description'] : '',
'#type' => variable_get('file_description_type', 'textfield'),
'#maxlength' => variable_get('file_description_length', 128), '#maxlength' => variable_get('file_description_length', 128),
'#description' => t('The description may be used as the label of the link to the file.'), '#description' => t('The description may be used as the label of the link to the file.'),
); );

1
modules/locale/locale.test
View File

@ -1730,7 +1730,6 @@ class LocaleBrowserDetectionTest extends DrupalUnitTestCase {
'eh' => 'eh-oh-laa-laa', 'eh' => 'eh-oh-laa-laa',
// Different qvalues. // Different qvalues.
'en-US,en;q=0.5,fr;q=0.25' => 'en-US',
'fr,en;q=0.5' => 'fr-CA', 'fr,en;q=0.5' => 'fr-CA',
'fr,en;q=0.5,fr-CA;q=0.25' => 'fr', 'fr,en;q=0.5,fr-CA;q=0.25' => 'fr',

2
modules/simpletest/tests/batch.test
View File

@ -341,8 +341,6 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
'33' => array('total' => 3, 'current' => 1), '33' => array('total' => 3, 'current' => 1),
// 2/3 is closer to 67% than to 66%. // 2/3 is closer to 67% than to 66%.
'67' => array('total' => 3, 'current' => 2), '67' => array('total' => 3, 'current' => 2),
// A full 3/3 should equal 100%.
'100' => array('total' => 3, 'current' => 3),
// 1/199 should round up to 1%. // 1/199 should round up to 1%.
'1' => array('total' => 199, 'current' => 1), '1' => array('total' => 199, 'current' => 1),
// 198/199 should round down to 99%. // 198/199 should round down to 99%.

2
modules/simpletest/tests/form.test
View File

@ -52,7 +52,7 @@ class FormsTestCase extends DrupalWebTestCase {
$elements['radios']['element'] = array('#title' => $this->randomName(), '#type' => 'radios', '#options' => array('' => t('None'), $this->randomName(), $this->randomName(), $this->randomName())); $elements['radios']['element'] = array('#title' => $this->randomName(), '#type' => 'radios', '#options' => array('' => t('None'), $this->randomName(), $this->randomName(), $this->randomName()));
$elements['radios']['empty_values'] = $empty_arrays; $elements['radios']['empty_values'] = $empty_arrays;
$elements['checkbox']['element'] = array('#title' => $this->randomName(), '#type' => 'checkbox', '#required' => TRUE, '#title' => $this->randomName()); $elements['checkbox']['element'] = array('#title' => $this->randomName(), '#type' => 'checkbox', '#required' => TRUE);
$elements['checkbox']['empty_values'] = $empty_checkbox; $elements['checkbox']['empty_values'] = $empty_checkbox;
$elements['checkboxes']['element'] = array('#title' => $this->randomName(), '#type' => 'checkboxes', '#options' => array($this->randomName(), $this->randomName(), $this->randomName())); $elements['checkboxes']['element'] = array('#title' => $this->randomName(), '#type' => 'checkboxes', '#options' => array($this->randomName(), $this->randomName(), $this->randomName()));