Changeset 17766

Show
Ignore:
Timestamp:
09/29/08 16:16:33 (2 months ago)
Author:
rambo
Message:

forward port r17765

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.helper.replicator/exporter.php

    r17556 r17766  
    111111            { 
    112112                unset($privileges, $privilege, $qb); 
    113                 debug_add("midcom_helper_replicator_serialize returned false for privilege {$privilege->guid}", MIDCOM_LOG_ERROR); 
     113                debug_add("midcom_helper_replicator_serialize returned false for privilege {$privilege->guid}, errstr: " . mgd_errstr(), MIDCOM_LOG_ERROR); 
    114114                debug_pop(); 
    115115                return false; 
    …… 
    141141        if ($attachment_serialized === false) 
    142142        { 
    143             debug_add("midcom_helper_replicator_serialize returned false for attachment {$attachment->guid}", MIDCOM_LOG_ERROR); 
     143            debug_add("midcom_helper_replicator_serialize returned false for attachment {$attachment->guid}, errstr: " . mgd_errstr(), MIDCOM_LOG_ERROR); 
    144144            debug_pop(); 
    145145            return false; 
    …… 
    151151        { 
    152152            unset($attachment_serialized); 
    153             debug_add("midcom_helper_replicator_serialize_blob returned false for attachment {$attachment->guid}", MIDCOM_LOG_ERROR); 
     153            debug_add("midcom_helper_replicator_serialize_blob returned false for attachment {$attachment->guid}, errstr: " . mgd_errstr(), MIDCOM_LOG_ERROR); 
    154154            debug_pop(); 
    155155            return false; 
    …… 
    276276            { 
    277277                unset($parameters, $parameter, $qb); 
    278                 debug_add("midcom_helper_replicator_serialize returned false for parameter {$parameter->guid}", MIDCOM_LOG_ERROR); 
     278                debug_add("midcom_helper_replicator_serialize returned false for parameter {$parameter->guid}, errstr: " . mgd_errstr(), MIDCOM_LOG_ERROR); 
    279279                debug_pop(); 
    280280                return false; 
    …… 
    371371        { 
    372372             $GLOBALS['midcom_helper_replicator_logger']->pop_prefix(); 
    373             debug_add("midcom_helper_replicator_serialize returned false for object {$object->guid}", MIDCOM_LOG_ERROR); 
     373            debug_add("midcom_helper_replicator_serialize returned false for object {$object->guid}, errstr: " . mgd_errstr(), MIDCOM_LOG_ERROR); 
    374374            debug_pop(); 
    375375            return false; 

  • trunk/midcom/midcom.helper.replicator/helpers.php

    r16789 r17766  
    2929        || $object->lang === 0) 
    3030    { 
    31         // Non-ML or not in langx does not trigger the bug 
     31        // Non-ML or not in langx does not trigger bug #259 
    3232        $stat = midgard_replicator::serialize($object); 
    3333        return midcom_helper_replicator_serialize_check_bug244($stat, $object); 
    …… 
    105105        $_MIDCOM->uimessages->add('midcom.helper.replicator', $msg, 'error'); 
    106106        $GLOBALS['midcom_helper_replicator_logger']->log_object($object, "has {$total_langs} languages, this triggers bug #244, preventing export.", MIDCOM_LOG_ERROR); 
     107        debug_push_class('function', __FUNCTION__); 
     108        debug_add("Object {$class} #{$object->id} has {$total_langs} languages, this triggers bug #244, preventing export", MIDCOM_LOG_WARN); 
     109        debug_pop(); 
    107110        unset($class, $object_url, $msg, $total_langs, $langs); 
    108         //debug_pop(); 
     111        mgd_set_errno(MGD_ERR_ERROR); 
    109112        return false; 
    110113    }