Quam Plures

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

  1. qp-bug-531252
  2. Merge into trunk
Proposed by Yabs
Status: Merged
Merge reported by: Yabs
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-bug-531252
Merge into: lp:quam-plures
Diff against target: 24 lines (+6/-1)
1 file modified
inc/_core/model/dataobjects/_dataobjectcache.class.php (+6/-1)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-bug-531252
Reviewer Review Type Date Requested Status
EdB Approve
Review via email: mp+20811@code.launchpad.net

Description of the change

Bug fix 531252

To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

2 bug fixes back to back? Wow! ... grabbing for testing at this time :)

Revision history for this message
EdB (edb) wrote :

Approved, and will do the merge thing. I need the practice :)

review: Approve
Revision history for this message
EdB (edb) wrote :

Crap I think I screwed up the process. Looks like it is in trunk but it doesn't say it was merged in. http://bazaar.launchpad.net/~quam-plures-gatekeepers/quam-plures/trunk/annotate/head%3A/inc/_core/model/dataobjects/_dataobjectcache.class.php

Had notes about it, can't find them, guessed. Damn. Really love this "system" :|

Revision history for this message
EdB (edb) wrote :

This has been merged. Someone else can figure out how to tell this jacked up POS that fact is a fact.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'inc/_core/model/dataobjects/_dataobjectcache.class.php'
2--- inc/_core/model/dataobjects/_dataobjectcache.class.php 2009-12-19 19:51:52 +0000
3+++ inc/_core/model/dataobjects/_dataobjectcache.class.php 2010-03-06 10:34:20 +0000
4@@ -569,6 +569,11 @@
5 */
6 function get_option_list( $default = 0, $allow_none = false, $method = 'get_name', $ignore_IDs = array() )
7 {
8+ if( !is_array( $default ) )
9+ {
10+ $default = array( $default );
11+ }
12+
13 if( ! $this->all_loaded && $this->load_all )
14 { // We have not loaded all items so far, but we're allowed to.
15 if ( empty( $ignore_IDs ) )
16@@ -598,7 +603,7 @@
17 }
18
19 $r .= '<option value="'.$loop_Obj->ID.'"';
20- if( $loop_Obj->ID == $default ) $r .= ' selected="selected"';
21+ if( in_array( $loop_Obj->ID, $default ) ) $r .= ' selected="selected"';
22 $r .= '>';
23 $r .= format_to_output( $loop_Obj->$method(), 'htmlbody' );
24 $r .= '</option>'."\n";

Subscribers

People subscribed via source and target branches