Changeset 15359

Show
Ignore:
Timestamp:
03/04/08 10:13:47 (7 months ago)
Author:
rambo
Message:

forward port r15358

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.admin.user/handler/group/edit.php

    r14773 r15359  
    9797        $qb = midcom_db_member::new_query_builder(); 
    9898        $qb->add_constraint('gid', '=', $this->_group->id); 
    99         if ($qb->count_unchecked() > $this->_config->get('list_users_max')) 
     99        if (   $qb->count_unchecked() > $this->_config->get('list_users_max') 
     100            && isset($this->_schemadb['default']->fields['persons'])) 
    100101        { 
    101102            unset($this->_schemadb['default']->fields['persons']); 
    102         } 
     103            $field_order_key = array_search('persons', $this->_schemadb['default']->field_order); 
     104            if ($field_order_key !== false) 
     105            { 
     106                unset($this->_schemadb['default']->field_order[$field_order_key]); 
     107            } 
     108        } 
     109        unset($qb); 
    103110         
    104111        $this->_controller =& midcom_helper_datamanager2_controller::create('simple'); 

  • trunk/midcom/midcom.helper.datamanager2/formmanager.php

    r15357 r15359  
    227227            if (!isset($this->_schema->fields[$name])) 
    228228            { 
    229                 debug_push_class(__CLASS__, __FUNCTION); 
     229                debug_push_class(__CLASS__, __FUNCTION__); 
    230230                debug_add("Field {$name} is not present in \$this->_schema->fields (read from \$this->_schema->field_order)", MIDCOM_LOG_ERROR); 
    231231                debug_pop();