Changeset 14404

Show
Ignore:
Timestamp:
01/14/08 12:26:09 (8 months ago)
Author:
flack
Message:

fixed a few calls to generate_error where the order of parameters was wrong

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.core/midcom/helper/itemlist.php

    r14392 r14404  
    118118        if (! is_a($parent_topic, 'midgard_topic' ))  
    119119        { 
    120            $_MIDCOM->generate_error('midcom_helper_itemlist::factory: parent topic not a midgard_topic object', MIDCOM_LOG_WARN);  
     120         $_MIDCOM->generate_error(MIDCOM_LOG_WARN, 'midcom_helper_itemlist::factory: parent topic not a midgard_topic object');  
    121121        } 
    122122      
    …… 
    130130         $sortclass->_init($_basicnav, $parent_topic); 
    131131        } else { 
    132          $_MIDCOM->generate_error("Tried to load sorting helper class for order {$sorting}, but the class was undefined.", MIDCOM_LOG_WARN);       
     132         $_MIDCOM->generate_error(MIDCOM_LOG_WARN, "Tried to load sorting helper class for order {$sorting}, but the class was undefined.");       
    133133        }  
    134134      

  • trunk/midcom/midcom.core/midcom/services/_sessioning.php

    r14329 r14404  
    6565        if ($started) 
    6666        { 
    67             $_MIDCOM->generate_error("MidCOM Sessioning has already been started, it must not be started twice. Aborting", 
    68                                                MIDCOM_ERRCRIT); 
     67          $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "MidCOM Sessioning has already been started, it must not be started twice. Aborting"); 
    6968        } 
    7069 

  • trunk/midcom/midcom.helper.datamanager/datamanager.php

    r14392 r14404  
    19711971            $locker = mgd_get_person($lock["user"]); 
    19721972            if (! $locker) 
    1973                 $_MIDCOM->generate_error("CRITICAL FAILURE: Locker person record does not exist: " 
    1974                                                    . mgd_errstr(), MIDCOM_ERRCRIT); 
     1973              $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "CRITICAL FAILURE: Locker person record does not exist: " . mgd_errstr()); 
    19751974            $this->_lock["user_name"] = $locker->name; 
    19761975            $this->_lock["user_record"] = $locker; 

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

    r14380 r14404  
    248248        if (! array_key_exists($name, $this->_raw_schemadb)) 
    249249        { 
    250             $_MIDCOM->generate_error("The schema {$name} was not found in the schema database.", 
    251                 MIDCOM_ERRCRIT); 
     250            $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "The schema {$name} was not found in the schema database."); 
    252251            // This will exit. 
    253252        } 
    …… 
    336335        if (array_key_exists($name, $this->fields)) 
    337336        { 
    338             $_MIDCOM->generate_error("Duplicate field {$name} encountered, schema operation is invalid. Aborting.", 
    339                 MIDCOM_ERRCRIT); 
     337            $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Duplicate field {$name} encountered, schema operation is invalid. Aborting."); 
    340338            // This will exit. 
    341339        } 

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

    r14380 r14404  
    102102                if ($type_definition['required'] == true) 
    103103                { 
    104                     $_MIDCOM->generate_error("Failed to process the type array for the schema {$this->_schema->name}: " 
    105                         . "The type for the required field {$name} was not found.", MIDCOM_ERRCRIT); 
     104                    $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to process the type array for the schema {$this->_schema->name}: " 
     105                        . "The type for the required field {$name} was not found."); 
    106106                    // This will exit. 
    107107                } 
    …… 
    173173                if ($type_definition['required'] == true) 
    174174                { 
    175                     $_MIDCOM->generate_error("Failed to process the type array for the schema {$this->_schema->name}: " 
    176                         . "The type for the required field {$name} was not found.", MIDCOM_ERRCRIT); 
     175                    $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to process the type array for the schema {$this->_schema->name}: " 
     176                        . "The type for the required field {$name} was not found."); 
    177177                    // This will exit. 
    178178                }