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

- Patch #216515 by chx, Damien Tournoud, et al: fixed form API glitch with caching.

merge-requests/26/head
Dries Buytaert 2008-06-24 17:01:33 +00:00
parent 21da8b32dc
commit 81c71bc891
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/form.inc
View File

@ -852,6 +852,7 @@ function form_builder($form_id, $form, &$form_state) {
} }
if (isset($form['#type']) && $form['#type'] == 'form') { if (isset($form['#type']) && $form['#type'] == 'form') {
$cache = NULL;
$complete_form = $form; $complete_form = $form;
if (!empty($form['#programmed'])) { if (!empty($form['#programmed'])) {
$form_state['submitted'] = TRUE; $form_state['submitted'] = TRUE;

2
includes/menu.inc
View File

@ -622,7 +622,7 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) {
$router_item['href'] = implode('/', $link_map); $router_item['href'] = implode('/', $link_map);
$router_item['options'] = array(); $router_item['options'] = array();
_menu_check_access($router_item, $map); _menu_check_access($router_item, $map);
// For performance, don't localize an item the user can't access. // For performance, don't localize an item the user can't access.
if ($router_item['access']) { if ($router_item['access']) {
_menu_item_localize($router_item, $map); _menu_item_localize($router_item, $map);

2
modules/comment/comment.pages.inc
View File

@ -56,7 +56,7 @@ function comment_reply($node, $pid = NULL) {
if (user_access('access comments')) { if (user_access('access comments')) {
// The user is previewing a comment prior to submitting it. // The user is previewing a comment prior to submitting it.
if ($op == t('Preview comment')) { if ($op == t('Preview')) {
if (user_access('post comments')) { if (user_access('post comments')) {
$output .= comment_form_box(array('pid' => $pid, 'nid' => $node->nid), NULL); $output .= comment_form_box(array('pid' => $pid, 'nid' => $node->nid), NULL);
} }

2
modules/comment/comment.test
View File

@ -68,7 +68,7 @@ class CommentTestCase extends DrupalWebTestCase {
$this->drupalGet('comment/edit/' . $reply->id); $this->drupalGet('comment/edit/' . $reply->id);
$reply = $this->postComment(NULL, $this->randomName(), $this->randomName()); $reply = $this->postComment(NULL, $this->randomName(), $this->randomName());
$this->assertTrue($this->commentExists($reply, TRUE), t('Modified reply found.')); $this->assertTrue($this->commentExists($reply, TRUE), t('Modified reply found.'));
// Correct link count // Correct link count
$this->drupalGet('node'); $this->drupalGet('node');
$this->assertRaw('2 comments', t('Link to the 2 comments exist.')); $this->assertRaw('2 comments', t('Link to the 2 comments exist.'));

2
profiles/default/default.profile
View File

@ -133,7 +133,7 @@ function default_profile_tasks(&$task, $url) {
$theme_settings['toggle_node_info_page'] = FALSE; $theme_settings['toggle_node_info_page'] = FALSE;
variable_set('theme_settings', $theme_settings); variable_set('theme_settings', $theme_settings);
// Create a default tags vocabulary for articles. // Create a default tags vocabulary for articles.
$description = st('Tags are used to group your articles into different categories.'); $description = st('Tags are used to group your articles into different categories.');
$help = st('Enter a comma separated list of words.'); $help = st('Enter a comma separated list of words.');
db_query("INSERT INTO {vocabulary} VALUES (1, 'Tags', '%s', '%s', 0, 0, 0, 0, 1, 'taxonomy', 0);", $description, $help); db_query("INSERT INTO {vocabulary} VALUES (1, 'Tags', '%s', '%s', 0, 0, 0, 0, 1, 'taxonomy', 0);", $description, $help);