Changeset 17795

Show
Ignore:
Timestamp:
09/30/08 10:18:35 (2 months ago)
Author:
rambo
Message:

try-catch around get_snippet_by_path here, fixes #296

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/midcom.helper.datamanager2/exec/universalchooser_handler.php

    r17523 r17795  
    4949// Get the shared secret 
    5050$shared_secret = null; 
    51 $key_snippet = mgd_get_snippet_by_path('/sitegroup-config/midcom.helper.datamanager2/widget_universalchooser_key'); 
     51try 
     52{ 
     53    $key_snippet = mgd_get_snippet_by_path('/sitegroup-config/midcom.helper.datamanager2/widget_universalchooser_key'); 
     54} 
     55catch (midgard_error_exception $e) 
     56{ 
     57    //FIXME: Make sure this is actually the correct code (and midgard-php sets the code) 
     58    if ($e->getCode() !== 0) 
     59    { 
     60        throw $e; 
     61    } 
     62    $key_snippet = null; 
     63} 
    5264if (   !is_object($key_snippet) 
    5365    || empty($key_snippet->doc)) 

  • trunk/midcom/midcom.helper.datamanager2/widget/universalchooser.php

    r17658 r17795  
    193193        } 
    194194 
    195         $key_snippet = mgd_get_snippet_by_path('/sitegroup-config/midcom.helper.datamanager2/widget_universalchooser_key'); 
     195        try 
     196        { 
     197            $key_snippet = mgd_get_snippet_by_path('/sitegroup-config/midcom.helper.datamanager2/widget_universalchooser_key'); 
     198        } 
     199        catch (midgard_error_exception $e) 
     200        { 
     201            //FIXME: Make sure this is actually the correct code (and midgard-php sets the code) 
     202            if ($e->getCode() !== 0) 
     203            { 
     204                throw $e; 
     205            } 
     206            $key_snippet = null; 
     207        } 
    196208        if (   !is_object($key_snippet) 
    197209            || empty($key_snippet->doc))