'; ?>
diff --git a/modules/book/book-navigation.tpl.php b/modules/book/book-navigation.tpl.php
index e5883dc..5d8e9aa 100644
--- a/modules/book/book-navigation.tpl.php
+++ b/modules/book/book-navigation.tpl.php
@@ -35,13 +35,13 @@
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index c17c5a6..59c9ad7 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -92,7 +92,7 @@ function comment_help($path, $arg) {
* Implements hook_entity_info().
*/
function comment_entity_info() {
- $return = array(
+ $return = array(
'comment' => array(
'label' => t('Comment'),
'base table' => 'comment',
@@ -542,7 +542,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) {
elseif ($flat) {
// Flat comments.
$count = $num_comments - $new_replies;
- $pageno = $count / $comments_per_page;
+ $pageno = $count / $comments_per_page;
}
else {
// Threaded comments: we build a query with a subquery to find the first
@@ -575,7 +575,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) {
':thread' => $first_thread,
))->fetchField();
- $pageno = $count / $comments_per_page;
+ $pageno = $count / $comments_per_page;
}
if ($pageno >= 1) {
@@ -1439,7 +1439,7 @@ function comment_save($comment) {
$transaction = db_transaction();
try {
- $defaults = array(
+ $defaults = array(
'mail' => '',
'homepage' => '',
'name' => '',
@@ -1711,7 +1711,7 @@ function comment_num_new($nid, $timestamp = 0) {
$timestamp = ($timestamp > NODE_NEW_LIMIT ? $timestamp : NODE_NEW_LIMIT);
// Use the timestamp to retrieve the number of new comments.
- return db_query('SELECT COUNT(cid) FROM {comment} WHERE nid = :nid AND created > :timestamp AND status = :status', array(
+ return db_query('SELECT COUNT(cid) FROM {comment} WHERE nid = :nid AND created > :timestamp AND status = :status', array(
':nid' => $nid,
':timestamp' => $timestamp,
':status' => COMMENT_PUBLISHED,
@@ -2279,10 +2279,10 @@ function template_preprocess_comment(&$variables) {
// Set status to a string representation of comment->status.
if (isset($comment->in_preview)) {
- $variables['status'] = 'comment-preview';
+ $variables['status'] = 'comment-preview';
}
else {
- $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : 'comment-published';
+ $variables['status'] = ($comment->status == COMMENT_NOT_PUBLISHED) ? 'comment-unpublished' : 'comment-published';
}
// Gather comment classes.
if ($comment->uid === 0) {
diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css
index ff310e3..88f4ba0 100644
--- a/modules/dblog/dblog.css
+++ b/modules/dblog/dblog.css
@@ -1,4 +1,3 @@
-
.form-item-type,
.form-item-severity {
float: left; /* LTR */
@@ -52,7 +51,9 @@ table#admin-dblog td.icon {
table#admin-dblog tr.dblog-warning td.icon {
background-image: url(../../misc/message-16-warning.png);
}
-table#admin-dblog tr.dblog-error td.icon {
+table#admin-dblog tr.dblog-error td.icon,
+table#admin-dblog tr.dblog-critical td.icon,
+table#admin-dblog tr.dblog-alert td.icon,
+table#admin-dblog tr.dblog-emerg td.icon {
background-image: url(../../misc/message-16-error.png);
}
-
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index 80c1dac..4b92501 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -273,7 +273,7 @@ function theme_field_multiple_value_form($variables) {
if ($element['#cardinality'] > 1 || $element['#cardinality'] == FIELD_CARDINALITY_UNLIMITED) {
$table_id = drupal_html_id($element['#field_name'] . '_values');
$order_class = $element['#field_name'] . '-delta-order';
- $required = !empty($element['#required']) ? '
' : '';
+ $required = !empty($element['#required']) ? theme('form_required_marker', $variables) : '';
$header = array(
array(
diff --git a/modules/field/tests/field_test.storage.inc b/modules/field/tests/field_test.storage.inc
index 3ca322d..a26af17 100644
--- a/modules/field/tests/field_test.storage.inc
+++ b/modules/field/tests/field_test.storage.inc
@@ -282,7 +282,7 @@ function field_test_field_storage_query($field_id, $conditions, $count, &$cursor
case '=':
$match = $match && $row->{$column} == $value;
break;
- case '!=':
+ case '<>':
case '<':
case '<=':
case '>':
diff --git a/modules/field/theme/field.tpl.php b/modules/field/theme/field.tpl.php
index e4cd85c..9e76e3b 100644
--- a/modules/field/theme/field.tpl.php
+++ b/modules/field/theme/field.tpl.php
@@ -49,11 +49,11 @@ After copying this file to your theme's folder and customizing it, remove this
HTML comment.
-->
>
-
+
>:
>
- $item) : ?>
+ $item): ?>
>
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index 2af3cb6..35696dd 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -428,7 +428,7 @@ function file_field_widget_settings_form($field, $instance) {
'bar' => t('Bar with progress meter'),
),
'#default_value' => $settings['progress_indicator'],
- '#description' => t('The throbber display does not show the status of uploads but takes up space. The progress bar is helpful for monitoring progress on large uploads.'),
+ '#description' => t('The throbber display does not show the status of uploads but takes up less space. The progress bar is helpful for monitoring progress on large uploads.'),
'#weight' => 16,
'#access' => file_progress_implementation(),
);
@@ -447,37 +447,18 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco
'description' => '',
);
- // Retrieve any values set in $form_state, as will be the case during Ajax
- // rebuilds of this form.
- if (isset($form_state['values'])) {
- $path = array_merge($element['#field_parents'], array($field['field_name'], $langcode));
- $path_exists = FALSE;
- $values = drupal_array_get_nested_value($form_state['values'], $path, $path_exists);
- if ($path_exists) {
- $items = $values;
- drupal_array_set_nested_value($form_state['values'], $path, NULL);
- }
- }
-
- foreach ($items as $delta => $item) {
- $items[$delta] = array_merge($defaults, $items[$delta]);
- // Remove any items from being displayed that are not needed.
- if ($items[$delta]['fid'] == 0) {
- unset($items[$delta]);
- }
+ // Load the items for form rebuilds from the field state as they might not be
+ // in $form_state['values'] because of validation limitations. Also, they are
+ // only passed in as $items when editing existing entities.
+ $field_state = field_form_get_state($element['#field_parents'], $field['field_name'], $langcode, $form_state);
+ if (isset($field_state['items'])) {
+ $items = $field_state['items'];
}
- // Re-index deltas after removing empty items.
- $items = array_values($items);
-
- // Update order according to weight.
- $items = _field_sort_items($field, $items);
-
// Essentially we use the managed_file type, extended with some enhancements.
$element_info = element_info('managed_file');
$element += array(
'#type' => 'managed_file',
- '#default_value' => isset($items[$delta]) ? $items[$delta] : $defaults,
'#upload_location' => file_field_widget_uri($field, $instance),
'#upload_validators' => file_field_widget_upload_validators($field, $instance),
'#value_callback' => 'file_field_widget_value',
@@ -487,6 +468,8 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco
);
if ($field['cardinality'] == 1) {
+ // Set the default value.
+ $element['#default_value'] = !empty($items) ? $items[0] : $defaults;
// If there's only one field, return it as delta 0.
if (empty($element['#default_value']['fid'])) {
$element['#description'] = theme('file_upload_help', array('description' => $element['#description'], 'upload_validators' => $element['#upload_validators']));
@@ -495,15 +478,15 @@ function file_field_widget_form(&$form, &$form_state, $field, $instance, $langco
}
else {
// If there are multiple values, add an element for each existing one.
- $delta = -1;
- foreach ($items as $delta => $item) {
+ foreach ($items as $item) {
$elements[$delta] = $element;
$elements[$delta]['#default_value'] = $item;
$elements[$delta]['#weight'] = $delta;
+ $delta++;
}
- // And then add one more empty row for new uploads.
- $delta++;
- if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta < $field['cardinality']) {
+ // And then add one more empty row for new uploads except when this is a
+ // programmed form as it is not necessary.
+ if (($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta < $field['cardinality']) && empty($form_state['programmed'])) {
$elements[$delta] = $element;
$elements[$delta]['#default_value'] = $defaults;
$elements[$delta]['#weight'] = $delta;
@@ -757,6 +740,32 @@ function file_field_widget_submit($form, &$form_state) {
// so nothing is lost in doing this.
$parents = array_slice($form_state['triggering_element']['#parents'], 0, -2);
drupal_array_set_nested_value($form_state['input'], $parents, NULL);
+
+ $button = $form_state['triggering_element'];
+
+ // Go one level up in the form, to the widgets container.
+ $element = drupal_array_get_nested_value($form, array_slice($button['#array_parents'], 0, -1));
+ $field_name = $element['#field_name'];
+ $langcode = $element['#language'];
+ $parents = $element['#field_parents'];
+
+ $submitted_values = drupal_array_get_nested_value($form_state['values'], array_slice($button['#array_parents'], 0, -2));
+ foreach ($submitted_values as $delta => $submitted_value) {
+ if (!$submitted_value['fid']) {
+ unset($submitted_values[$delta]);
+ }
+ }
+
+ // Re-index deltas after removing empty items.
+ $submitted_values = array_values($submitted_values);
+
+ // Update form_state values.
+ drupal_array_set_nested_value($form_state['values'], array_slice($button['#array_parents'], 0, -2), $submitted_values);
+
+ // Update items.
+ $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state);
+ $field_state['items'] = $submitted_values;
+ field_form_set_state($parents, $field_name, $langcode, $form_state, $field_state);
}
/**
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index ef250ef..59f6e0c 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -380,7 +380,7 @@ class FileFieldWidgetTestCase extends FileFieldTestCase {
}
/**
- * Tests upload and remove buttons, with and without Ajax, for a multi-valued File field.
+ * Tests upload and remove buttons, with and without Ajax, for multiple multi-valued File field.
*/
function testMultiValuedWidget() {
// Use 'page' instead of 'article', so that the 'article' image field does
@@ -389,77 +389,106 @@ class FileFieldWidgetTestCase extends FileFieldTestCase {
// using a custom node type.
$type_name = 'page';
$field_name = strtolower($this->randomName());
+ $field_name2 = strtolower($this->randomName());
$this->createFileField($field_name, $type_name, array('cardinality' => 3));
+ $this->createFileField($field_name2, $type_name, array('cardinality' => 3));
+
$field = field_info_field($field_name);
$instance = field_info_instance('node', $field_name, $type_name);
+ $field2 = field_info_field($field_name2);
+ $instance2 = field_info_instance('node', $field_name2, $type_name);
+
$test_file = $this->getTestFile('text');
foreach (array('nojs', 'js') as $type) {
- // Visit the node creation form, and upload 3 files. Since the field has
- // cardinality of 3, ensure the "Upload" button is displayed until after
- // the 3rd file, and after that, isn't displayed.
+ // Visit the node creation form, and upload 3 files for each field. Since
+ // the field has cardinality of 3, ensure the "Upload" button is displayed
+ // until after the 3rd file, and after that, isn't displayed. Because
+ // SimpleTest triggers the last button with a given name, so upload to the
+ // second field first.
// @todo This is only testing a non-Ajax upload, because drupalPostAJAX()
// does not yet emulate jQuery's file upload.
+ //
$this->drupalGet("node/add/$type_name");
- for ($delta = 0; $delta < 3; $delta++) {
- $edit = array('files[' . $field_name . '_' . LANGUAGE_NONE . '_' . $delta . ']' => drupal_realpath($test_file->uri));
- // If the Upload button doesn't exist, drupalPost() will automatically
- // fail with an assertion message.
- $this->drupalPost(NULL, $edit, t('Upload'));
- }
- $this->assertNoFieldByXpath('//input[@type="submit"]', t('Upload'), t('After uploading 3 files, the "Upload" button is no longer displayed.'));
-
- // Test clicking each "Remove" button. For extra robustness, test them out
- // of sequential order. They are 0-indexed, and get renumbered after each
- // iteration, so array(1, 1, 0) means:
- // - First remove the 2nd file.
- // - Then remove what is then the 2nd file (was originally the 3rd file).
- // - Then remove the first file.
- $num_expected_remove_buttons = 3;
- foreach (array(1, 1, 0) as $delta) {
- // Ensure we have the expected number of Remove buttons, and that they
- // are numbered sequentially.
- $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
- $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, t('There are %n "Remove" buttons displayed (JSMode=%type).', array('%n' => $num_expected_remove_buttons, '%type' => $type)));
- foreach ($buttons as $i => $button) {
- $this->assertIdentical((string) $button['name'], $field_name . '_' . LANGUAGE_NONE . '_' . $i . '_remove_button');
+ foreach (array($field_name2, $field_name) as $each_field_name) {
+ for ($delta = 0; $delta < 3; $delta++) {
+ $edit = array('files[' . $each_field_name . '_' . LANGUAGE_NONE . '_' . $delta . ']' => drupal_realpath($test_file->uri));
+ // If the Upload button doesn't exist, drupalPost() will automatically
+ // fail with an assertion message.
+ $this->drupalPost(NULL, $edit, t('Upload'));
}
+ }
+ $this->assertNoFieldByXpath('//input[@type="submit"]', t('Upload'), t('After uploading 3 files for each field, the "Upload" button is no longer displayed.'));
+
+ $num_expected_remove_buttons = 6;
+
+ foreach (array($field_name, $field_name2) as $current_field_name) {
+ // How many uploaded files for the current field are remaining.
+ $remaining = 3;
+ // Test clicking each "Remove" button. For extra robustness, test them out
+ // of sequential order. They are 0-indexed, and get renumbered after each
+ // iteration, so array(1, 1, 0) means:
+ // - First remove the 2nd file.
+ // - Then remove what is then the 2nd file (was originally the 3rd file).
+ // - Then remove the first file.
+ foreach (array(1,1,0) as $delta) {
+ // Ensure we have the expected number of Remove buttons, and that they
+ // are numbered sequentially.
+ $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
+ $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, t('There are %n "Remove" buttons displayed (JSMode=%type).', array('%n' => $num_expected_remove_buttons, '%type' => $type)));
+ foreach ($buttons as $i => $button) {
+ $key = $i >= $remaining ? $i - $remaining : $i;
+ $check_field_name = $field_name2;
+ if ($current_field_name == $field_name && $i < $remaining) {
+ $check_field_name = $field_name;
+ }
- // "Click" the remove button (emulating either a nojs or js submission).
- $button_name = $field_name . '_' . LANGUAGE_NONE . '_' . $delta . '_remove_button';
- switch ($type) {
- case 'nojs':
- // drupalPost() takes a $submit parameter that is the value of the
- // button whose click we want to emulate. Since we have multiple
- // buttons with the value "Remove", and want to control which one we
- // use, we change the value of the other ones to something else.
- // Since non-clicked buttons aren't included in the submitted POST
- // data, and since drupalPost() will result in $this being updated
- // with a newly rebuilt form, this doesn't cause problems.
- foreach ($buttons as $button) {
- if ($button['name'] != $button_name) {
- $button['value'] = 'DUMMY';
+ $this->assertIdentical((string) $button['name'], $check_field_name . '_' . LANGUAGE_NONE . '_' . $key. '_remove_button');
+ }
+
+ // "Click" the remove button (emulating either a nojs or js submission).
+ $button_name = $current_field_name . '_' . LANGUAGE_NONE . '_' . $delta . '_remove_button';
+ switch ($type) {
+ case 'nojs':
+ // drupalPost() takes a $submit parameter that is the value of the
+ // button whose click we want to emulate. Since we have multiple
+ // buttons with the value "Remove", and want to control which one we
+ // use, we change the value of the other ones to something else.
+ // Since non-clicked buttons aren't included in the submitted POST
+ // data, and since drupalPost() will result in $this being updated
+ // with a newly rebuilt form, this doesn't cause problems.
+ foreach ($buttons as $button) {
+ if ($button['name'] != $button_name) {
+ $button['value'] = 'DUMMY';
+ }
}
- }
- $this->drupalPost(NULL, array(), t('Remove'));
- break;
- case 'js':
- // drupalPostAJAX() lets us target the button precisely, so we don't
- // require the workaround used above for nojs.
- $this->drupalPostAJAX(NULL, array(), array($button_name => t('Remove')));
- break;
+ $this->drupalPost(NULL, array(), t('Remove'));
+ break;
+ case 'js':
+ // drupalPostAJAX() lets us target the button precisely, so we don't
+ // require the workaround used above for nojs.
+ $this->drupalPostAJAX(NULL, array(), array($button_name => t('Remove')));
+ break;
+ }
+ $num_expected_remove_buttons--;
+ $remaining--;
+
+ // Ensure an "Upload" button for the current field is displayed with the
+ // correct name.
+ $upload_button_name = $current_field_name . '_' . LANGUAGE_NONE . '_' . $remaining . '_upload_button';
+ $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', array(':name' => $upload_button_name));
+ $this->assertTrue(is_array($buttons) && count($buttons) == 1, t('The upload button is displayed with the correct name (JSMode=%type).', array('%type' => $type)));
+
+ // Ensure only at most one button per field is displayed.
+ $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
+ $expected = $current_field_name == $field_name ? 1 : 2;
+ $this->assertTrue(is_array($buttons) && count($buttons) == $expected, t('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', array('%type' => $type)));
}
- $num_expected_remove_buttons--;
-
- // Ensure we have a single Upload button, and that it is numbered
- // sequentially after the Remove buttons.
- $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
- $this->assertTrue(is_array($buttons) && count($buttons) == 1 && ((string) $buttons[0]['name'] === ($field_name . '_' . LANGUAGE_NONE . '_' . $num_expected_remove_buttons . '_upload_button')), t('After removing a file, an "Upload" button is displayed (JSMode=%type).'));
}
// Ensure the page now has no Remove buttons.
- $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), t('After removing all files, there is no "Remove" button displayed.', array('%n' => $num_expected_remove_buttons, '%type' => $type)));
+ $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), t('After removing all files, there is no "Remove" button displayed (JSMode=%type).', array('%type' => $type)));
// Save the node and ensure it does not have any files.
$this->drupalPost(NULL, array('title' => $this->randomName()), t('Save'));
diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc
index 1e6b365..49c71d9 100644
--- a/modules/forum/forum.admin.inc
+++ b/modules/forum/forum.admin.inc
@@ -55,7 +55,7 @@ function forum_form_forum($form, &$form_state, $edit = array()) {
$form['vid'] = array('#type' => 'hidden', '#value' => variable_get('forum_nav_vocabulary', ''));
$form['actions'] = array('#type' => 'actions');
- $form['actions']['submit' ] = array('#type' => 'submit', '#value' => t('Save'));
+ $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save'));
if ($edit['tid']) {
$form['actions']['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
$form['tid'] = array('#type' => 'hidden', '#value' => $edit['tid']);
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 5bb4392..0dcea5a 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -1127,7 +1127,6 @@ function template_preprocess_forum_topic_list(&$variables) {
$variables['topics'][$id]->title = l($topic->title, "node/$topic->nid");
$variables['topics'][$id]->message = '';
}
- $topic->uid = $topic->last_comment_uid ? $topic->last_comment_uid : $topic->uid;
$variables['topics'][$id]->created = theme('forum_submitted', array('topic' => $topic));
$variables['topics'][$id]->last_reply = theme('forum_submitted', array('topic' => isset($topic->last_reply) ? $topic->last_reply : NULL));
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 7b5882c..d9b98cc 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -286,6 +286,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
$form['link_path'] = array(
'#type' => 'textfield',
'#title' => t('Path'),
+ '#maxlength' => 255,
'#default_value' => $path,
'#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '
', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')),
'#required' => TRUE,
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 2540797..c914867 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -322,6 +322,9 @@ function menu_delete($menu) {
* @param $item
* The menu item or the node type for which to generate a list of parents.
* If $item['mlid'] == 0 then the complete tree is returned.
+ * @param $type
+ * The node type for which to generate a list of parents.
+ * If $item itself is a node type then $type is ignored.
* @return
* An array of menu link titles keyed on the a string containing the menu name
* and mlid. The list excludes the given item and its children.
@@ -329,7 +332,7 @@ function menu_delete($menu) {
* @todo This has to be turned into a #process form element callback. The
* 'menu_override_parent_selector' variable is entirely superfluous.
*/
-function menu_parent_options($menus, $item) {
+function menu_parent_options($menus, $item, $type = '') {
// The menu_links table can be practically any size and we need a way to
// allow contrib modules to provide more scalable pattern choosers.
// hook_form_alter is too late in itself because all the possible parents are
@@ -339,18 +342,22 @@ function menu_parent_options($menus, $item) {
}
$available_menus = array();
- if (is_array($item)) {
- // If $item is an array fill it with all menus given to this function.
+ if (!is_array($item)) {
+ // If $item is not an array then it is a node type.
+ // Use it as $type and prepare a dummy menu item for _menu_get_options().
+ $type = $item;
+ $item = array('mlid' => 0);
+ }
+ if (empty($type)) {
+ // If no node type is set, use all menus given to this function.
$available_menus = $menus;
}
else {
- // If $item is a node type, get all available menus for this type and
- // prepare a dummy menu item for _menu_parent_depth_limit().
- $type_menus = variable_get('menu_options_' . $item, array('main-menu' => 'main-menu'));
+ // If a node type is set, use all available menus for this type.
+ $type_menus = variable_get('menu_options_' . $type, array('main-menu' => 'main-menu'));
foreach ($type_menus as $menu) {
$available_menus[$menu] = $menu;
}
- $item = array('mlid' => 0);
}
return _menu_get_options($menus, $available_menus, $item);
@@ -600,15 +607,18 @@ function _menu_parent_depth_limit($item) {
* @see menu_node_submit()
*/
function menu_form_node_form_alter(&$form, $form_state) {
- // Generate a list of possible parents.
+ // Generate a list of possible parents (not including this link or descendants).
// @todo This must be handled in a #process handler.
+ $link = $form['#node']->menu;
$type = $form['#node']->type;
- $options = menu_parent_options(menu_get_menus(), $type);
+ // menu_parent_options() is goofy and can actually handle either a menu link
+ // or a node type both as second argument. Pick based on whether there is
+ // a link already (menu_node_prepare() sets mlid default to 0).
+ $options = menu_parent_options(menu_get_menus(), $link['mlid'] ? $link : $type);
// If no possible parent menu items were found, there is nothing to display.
if (empty($options)) {
return;
}
- $link = $form['#node']->menu;
$form['menu'] = array(
'#type' => 'fieldset',
@@ -659,9 +669,13 @@ function menu_form_node_form_alter(&$form, $form_state) {
);
$default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-menu:0'));
- // @todo This will fail with the new selective menus per content type.
+ // If the current parent menu item is not present in options, use the first
+ // available option as default value.
+ // @todo User should not be allowed to access menu link settings in such a
+ // case.
if (!isset($options[$default])) {
- $default = 'navigation:0';
+ $array = array_keys($options);
+ $default = reset($array);
}
$form['menu']['link']['parent'] = array(
'#type' => 'select',
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index b457177..0edfc47 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -680,5 +680,43 @@ class MenuNodeTestCase extends DrupalWebTestCase {
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
$link = menu_link_load($item['mlid']);
$this->assertTrue($link, t('Link in not allowed menu still exists after saving node'));
+
+ // Move the menu link back to the Navigation menu.
+ $item['menu_name'] = 'navigation';
+ menu_link_save($item);
+ // Create a second node.
+ $child_node = $this->drupalCreateNode(array('type' => 'article'));
+ // Assign a menu link to the second node, being a child of the first one.
+ $child_item = array(
+ 'link_path' => 'node/'. $child_node->nid,
+ 'link_title' => $this->randomName(16),
+ 'plid' => $item['mlid'],
+ );
+ menu_link_save($child_item);
+ // Edit the first node.
+ $this->drupalGet('node/'. $node->nid .'/edit');
+ // Assert that it is not possible to set the parent of the first node to itself or the second node.
+ $this->assertNoOption('edit-menu-parent', 'navigation:'. $item['mlid']);
+ $this->assertNoOption('edit-menu-parent', 'navigation:'. $child_item['mlid']);
+ }
+
+ /**
+ * Asserts that a select option in the current page does not exist.
+ *
+ * @param $id
+ * Id of select field to assert.
+ * @param $option
+ * Option to assert.
+ * @param $message
+ * Message to display.
+ * @return
+ * TRUE on pass, FALSE on fail.
+ *
+ * @todo move to simpletest drupal_web_test_case.php.
+ */
+ protected function assertNoOption($id, $option, $message = '') {
+ $selects = $this->xpath('//select[@id=:id]', array(':id' => $id));
+ $options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
+ return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : t('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), t('Browser'));
}
}
diff --git a/modules/node/node.module b/modules/node/node.module
index 6abfcb2..95b4219 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2447,7 +2447,7 @@ function node_feed($nids = FALSE, $channel = array()) {
$nids = db_select('node', 'n')
->fields('n', array('nid', 'created'))
->condition('n.promote', 1)
- ->condition('status', 1)
+ ->condition('n.status', 1)
->orderBy('n.created', 'DESC')
->range(0, variable_get('feed_default_items', 10))
->addTag('node_access')
diff --git a/modules/node/node.test b/modules/node/node.test
index 56a2d34..8a1899e 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -2270,6 +2270,7 @@ class NodeTokenReplaceTestCase extends DrupalWebTestCase {
$tests['[node:language]'] = check_plain($node->language);
$tests['[node:url]'] = url('node/' . $node->nid, $url_options);
$tests['[node:edit-url]'] = url('node/' . $node->nid . '/edit', $url_options);
+ $tests['[node:author]'] = check_plain(format_username($account));
$tests['[node:author:uid]'] = $node->uid;
$tests['[node:author:name]'] = check_plain(format_username($account));
$tests['[node:created:since]'] = format_interval(REQUEST_TIME - $node->created, 2, $language->language);
diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc
index 80dbda5..b6bafc6 100644
--- a/modules/node/node.tokens.inc
+++ b/modules/node/node.tokens.inc
@@ -157,8 +157,9 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
// Default values for the chained tokens handled below.
case 'author':
- $name = ($node->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $node->name;
- $replacements[$original] = $sanitize ? filter_xss($name) : $name;
+ $account = user_load($node->uid);
+ $name = format_username($account);
+ $replacements[$original] = $sanitize ? check_plain($name) : $name;
break;
case 'created':
diff --git a/modules/openid/openid.js b/modules/openid/openid.js
index 1f20427..fdc97fa 100644
--- a/modules/openid/openid.js
+++ b/modules/openid/openid.js
@@ -11,10 +11,10 @@ Drupal.behaviors.openid = {
if (cookie) {
$('#edit-openid-identifier').val(cookie);
}
- if ($('#edit-openid-identifier').val()) {
+ if ($('#edit-openid-identifier').val() || location.hash == '#openid-login') {
$('#edit-openid-identifier').addClass('openid-processed');
loginElements.hide();
- // Use .css('display', 'block') instead of .show() to Konqueror friendly.
+ // Use .css('display', 'block') instead of .show() to be Konqueror friendly.
openidElements.css('display', 'block');
}
}
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index bb6ad71..2bf891a 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -146,11 +146,11 @@ function _openid_user_login_form_alter(&$form, &$form_state) {
$items = array();
$items[] = array(
- 'data' => l(t('Log in using OpenID'), '#'),
+ 'data' => l(t('Log in using OpenID'), '#openid-login', array('external' => TRUE)),
'class' => array('openid-link'),
);
$items[] = array(
- 'data' => l(t('Cancel OpenID login'), '#'),
+ 'data' => l(t('Cancel OpenID login'), '#', array('external' => TRUE)),
'class' => array('user-link'),
);
diff --git a/modules/overlay/overlay-child.css b/modules/overlay/overlay-child.css
index d31952e..a2b23b4 100644
--- a/modules/overlay/overlay-child.css
+++ b/modules/overlay/overlay-child.css
@@ -17,6 +17,7 @@ html.js body {
min-width: 700px;
position: relative;
padding: .2em;
+ padding-bottom: 2em;
padding-right: 26px; /* LTR */
width: 88%;
}
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 2737c2b..13d2606 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -299,7 +299,9 @@ function poll_form($node, &$form_state) {
$form['choice_wrapper']['poll_more'] = array(
'#type' => 'submit',
'#value' => t('More choices'),
- '#description' => t("If the amount of boxes above isn't enough, click here to add more choices."),
+ '#attributes' => array(
+ 'title' => t("If the amount of boxes above isn't enough, click here to add more choices."),
+ ),
'#weight' => 1,
'#limit_validation_errors' => array(array('choice')),
'#submit' => array('poll_more_choices_submit'),
diff --git a/modules/profile/profile-block.tpl.php b/modules/profile/profile-block.tpl.php
index 0bd8331..dbdbcd8 100644
--- a/modules/profile/profile-block.tpl.php
+++ b/modules/profile/profile-block.tpl.php
@@ -31,9 +31,9 @@
?>
-
+
- type != 'checkbox') : ?>
+ type != 'checkbox'): ?>
title; ?>
value; ?>
diff --git a/modules/profile/profile-listing.tpl.php b/modules/profile/profile-listing.tpl.php
index d484ed2..d8b835a 100644
--- a/modules/profile/profile-listing.tpl.php
+++ b/modules/profile/profile-listing.tpl.php
@@ -43,7 +43,7 @@
diff --git a/modules/search/search-block-form.tpl.php b/modules/search/search-block-form.tpl.php
index 7844746..da58403 100644
--- a/modules/search/search-block-form.tpl.php
+++ b/modules/search/search-block-form.tpl.php
@@ -30,7 +30,7 @@
*/
?>