Changeset 15930

Show
Ignore:
Timestamp:
04/02/08 13:32:52 (6 months ago)
Author:
piotras
Message:

Replace PEAR_ERROR_DIE with PEAR_ERROR_RETURN.
InitializeMidgard? returns true imidietely when $_MIDGARD_CONNECTION superglobal is set.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/support/Role_Midgardelement/Midgardelement.php

    r13106 r15930  
    5656            if (!$stat) 
    5757            { 
    58                 PEAR::raiseError("Failed to create Midgard style \"{$new_style->name}\", check config directives in the Midgard conf.d file . Error was " . mgd_errstr(), mgd_errno(), PEAR_ERROR_DIE); 
     58                PEAR::raiseError("Failed to create Midgard style \"{$new_style->name}\", check config directives in the Midgard conf.d file . Error was " . mgd_errstr(), mgd_errno(), PEAR_ERROR_RETURN); 
    5959                return null; 
    6060            } 
    …… 
    9595        } 
    9696         
    97         PEAR::raiseError("Failed to load Midgard sitegroup \"{$sitegroup_config}\". Error: " . mgd_errstr(), mgd_errno(), PEAR_ERROR_DIE); 
     97        PEAR::raiseError("Failed to load Midgard sitegroup \"{$sitegroup_config}\". Error: " . mgd_errstr(), mgd_errno(), PEAR_ERROR_RETURN); 
    9898        return false; 
    9999    } 
    …… 
    101101    function initializeMidgard($init_file) 
    102102    { 
     103        if(isset($_MIDGARD_CONNECTION)) 
     104            return true; 
     105 
    103106        mgd_config_init($init_file); 
    104107        if (!isset($_MIDGARD)) 
    105108        { 
    106             PEAR::raiseError("Failed to initialize Midgard using configuration file \"{$init_file}\".", mgd_errno(), PEAR_ERROR_DIE); 
     109            PEAR::raiseError("Failed to initialize Midgard using configuration file \"{$init_file}\".", mgd_errno(), PEAR_ERROR_RETURN); 
    107110            return false; 
    108111        } 
    …… 
    124127        if (!file_exists($init_file_path)) 
    125128        { 
    126             PEAR::raiseError("Midgard configuration file \"{$init_file_path}\" not found.", mgd_errno(), PEAR_ERROR_DIE); 
     129            PEAR::raiseError("Midgard configuration file \"{$init_file_path}\" not found.", mgd_errno(), PEAR_ERROR_RETURN); 
    127130            return false; 
    128131        } 
    …… 
    161164            || is_null($midgard_password)) 
    162165        { 
    163             PEAR::raiseError("Midgard configuration file \"{$init_file}\" did not contain MidgardUsername and MidgardPassword directives.", mgd_errno(), PEAR_ERROR_DIE); 
     166            PEAR::raiseError("Midgard configuration file \"{$init_file}\" did not contain MidgardUsername and MidgardPassword directives.", mgd_errno(), PEAR_ERROR_RETURN); 
    164167            return false; 
    165168        } 
    …… 
    167170        if (!mgd_auth_midgard($midgard_username, $midgard_password)) 
    168171        { 
    169             PEAR::raiseError("Failed to authenticate as Midgard user \"{$midgard_username}\" using credentials from configuration file \"{$init_file}\".", mgd_errno(), PEAR_ERROR_DIE); 
     172            PEAR::raiseError("Failed to authenticate as Midgard user \"{$midgard_username}\" using credentials from configuration file \"{$init_file}\".", mgd_errno(), PEAR_ERROR_RETURN); 
    170173            return false; 
    171174        }