Quam Plures

Merge lp:~quam-plures-core/quam-plures/bug-614012 into lp:quam-plures

  1. bug-614012
  2. Merge into trunk
Proposed by Tilman Blumenbach
Status: Merged
Merged at revision: 7526
Proposed branch: lp:~quam-plures-core/quam-plures/bug-614012
Merge into: lp:quam-plures
Diff against target: 26 lines (+9/-2)
1 file modified
qp_inc/files/views/_file_delete.form.php (+9/-2)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/bug-614012
Reviewer Review Type Date Requested Status
EdB Approve
Review via email: mp+32004@code.launchpad.net
To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

tested, good, approved, will update with new trunk stuff and do the merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qp_inc/files/views/_file_delete.form.php'
2--- qp_inc/files/views/_file_delete.form.php 2010-02-19 10:50:37 +0000
3+++ qp_inc/files/views/_file_delete.form.php 2010-08-06 22:14:42 +0000
4@@ -46,7 +46,14 @@
5 $Form->begin_form( 'fform', T_('Delete') );
6
7 $Form->hidden_ctrl();
8- $Form->hiddens_by_key( get_memorized() );
9+ /**
10+ * Regenerate POSTed keys and their values but ignore the original
11+ * value of fm_selected and override it with the files which are
12+ * selected *now* (some files may have been removed from the list
13+ * because of delete restrictions).
14+ */
15+ $Form->hiddens_by_key( array_merge( get_memorized(),
16+ array( 'fm_selected' => $selected_Filelist->get_array( 'get_rdfp_rel_path' ) ) ) );
17 $Form->hidden( 'action', 'delete' );
18 $Form->hidden( 'confirmed', 1 );
19
20@@ -70,4 +77,4 @@
21 array( 'submit', 'submit', T_('Delete'), 'DeleteButton' ) ) );
22
23
24-?>
25\ No newline at end of file
26+?>

Subscribers

People subscribed via source and target branches