Quam Plures

Merge lp:~quam-plures-core/quam-plures/qp-bug-514719 into lp:quam-plures

  1. qp-bug-514719
  2. Merge into trunk
Proposed by Tilman Blumenbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-bug-514719
Merge into: lp:quam-plures
Diff against target: 43 lines (+10/-1)
3 files modified
inc/_core/_template.funcs.php (+7/-0)
inc/items/model/_item.class.php (+1/-1)
inc/items/model/_itemlist.class.php (+2/-0)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-bug-514719
Reviewer Review Type Date Requested Status
Yabs (community) Approve
Review via email: mp+18309@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yabs (yabs) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'inc/_core/_template.funcs.php'
2--- inc/_core/_template.funcs.php 2010-01-22 21:33:56 +0000
3+++ inc/_core/_template.funcs.php 2010-01-30 14:21:17 +0000
4@@ -818,6 +818,13 @@
5 {
6 global $Messages;
7
8+ $params = array_merge( array(
9+ // Default values taken from Log::disp().
10+ // Tblue> TODO: This seems redundant...
11+ 'block_start' => '<div class="action_messages">',
12+ 'block_end' => '</div>',
13+ ), $params );
14+
15 $Messages->disp( $params['block_start'], $params['block_end'] );
16 }
17
18
19=== modified file 'inc/items/model/_item.class.php'
20--- inc/items/model/_item.class.php 2010-01-22 21:33:56 +0000
21+++ inc/items/model/_item.class.php 2010-01-30 14:21:17 +0000
22@@ -2060,7 +2060,7 @@
23 * @todo EdB: pingbacks were covered here. the installer needs to convert these
24 * to trackbacks for evoupgraders, and core needs to forget these ever existed
25 */
26- function feedback_link( $params )
27+ function feedback_link( $params = array() )
28 {
29 if( ! $this->can_see_comments() )
30 { // Comments disabled
31
32=== modified file 'inc/items/model/_itemlist.class.php'
33--- inc/items/model/_itemlist.class.php 2010-01-22 21:33:56 +0000
34+++ inc/items/model/_itemlist.class.php 2010-01-30 14:21:17 +0000
35@@ -442,6 +442,8 @@
36 'next_text' => '$title$ &raquo;',
37 'next_end' => '',
38 'next_no_item' => '',
39+ 'block_start' => '',
40+ 'block_end' => '',
41 ), $params );
42
43 $prev = $this->prev_item_link( $params['prev_start'], $params['prev_end'], $params[ 'prev_text' ], $params[ 'prev_no_item' ], false );

Subscribers

People subscribed via source and target branches