@@ -64,7 +64,8 @@ discard block |
||
| 64 | 64 | { |
| 65 | 65 | try { |
| 66 | 66 | $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid); |
| 67 | - } catch (midcom_error $e) { |
|
| 67 | + } |
|
| 68 | + catch (midcom_error $e) { |
|
| 68 | 69 | if (midcom_connection::get_error() == MGD_ERR_OBJECT_DELETED) { |
| 69 | 70 | $relocate = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) . '__mfa/asgard/object/deleted/' . $guid . '/'; |
| 70 | 71 | midcom::get()->relocate($relocate); |
@@ -232,8 +233,7 @@ discard block |
||
| 232 | 233 | $this->_new_object = new $create_type(); |
| 233 | 234 | $mgd_type = midcom::get()->dbclassloader->get_mgdschema_class_name_for_midcom_class($create_type); |
| 234 | 235 | |
| 235 | - if ($parent_property = midgard_object_class::get_property_parent($mgd_type)) |
|
| 236 | - { |
|
| 236 | + if ($parent_property = midgard_object_class::get_property_parent($mgd_type)) { |
|
| 237 | 237 | $this->_new_object->$parent_property = $controller->formmanager->get_value($parent_property); |
| 238 | 238 | } |
| 239 | 239 | |
@@ -136,7 +136,8 @@ |
||
| 136 | 136 | |
| 137 | 137 | try { |
| 138 | 138 | $user = new midgard_user($login_tokens); |
| 139 | - } catch (midgard_error_exception $e) { |
|
| 139 | + } |
|
| 140 | + catch (midgard_error_exception $e) { |
|
| 140 | 141 | return false; |
| 141 | 142 | } |
| 142 | 143 | |
@@ -384,7 +384,8 @@ discard block |
||
| 384 | 384 | $value = $link->value; |
| 385 | 385 | |
| 386 | 386 | $tags[$key] = $value; |
| 387 | - } catch (midcom_error $e) { |
|
| 387 | + } |
|
| 388 | + catch (midcom_error $e) { |
|
| 388 | 389 | $e->log(); |
| 389 | 390 | } |
| 390 | 391 | } |
@@ -443,7 +444,8 @@ discard block |
||
| 443 | 444 | try { |
| 444 | 445 | $tag = net_nemein_tag_tag_dba::get_cached($link->tag); |
| 445 | 446 | $link_object_map[$link->fromGuid][$tag->tag] = $link; |
| 446 | - } catch (midcom_error $e) { |
|
| 447 | + } |
|
| 448 | + catch (midcom_error $e) { |
|
| 447 | 449 | $e->log(); |
| 448 | 450 | } |
| 449 | 451 | } |
@@ -472,7 +474,8 @@ discard block |
||
| 472 | 474 | $tmpobject = midcom::get()->dbfactory->convert_midgard_to_midcom($tmpobject); |
| 473 | 475 | } |
| 474 | 476 | $return[] = $tmpobject; |
| 475 | - } catch (midcom_error $e) { |
|
| 477 | + } |
|
| 478 | + catch (midcom_error $e) { |
|
| 476 | 479 | $e->log(); |
| 477 | 480 | } |
| 478 | 481 | } |
@@ -152,7 +152,8 @@ |
||
| 152 | 152 | try { |
| 153 | 153 | $topic = new midcom_db_topic($id); |
| 154 | 154 | $id = $topic->id; |
| 155 | - } catch (midcom_error $e) { |
|
| 155 | + } |
|
| 156 | + catch (midcom_error $e) { |
|
| 156 | 157 | $e->log(); |
| 157 | 158 | break; |
| 158 | 159 | } |
@@ -66,7 +66,8 @@ |
||
| 66 | 66 | try { |
| 67 | 67 | $author = new midcom_db_person($wikipage->metadata->revisor); |
| 68 | 68 | $item->author = $author->name; |
| 69 | - } catch (midcom_error $e) { |
|
| 69 | + } |
|
| 70 | + catch (midcom_error $e) { |
|
| 70 | 71 | $e->log(); |
| 71 | 72 | } |
| 72 | 73 | |
@@ -114,7 +114,8 @@ |
||
| 114 | 114 | } else { |
| 115 | 115 | try { |
| 116 | 116 | net_nemein_wiki_viewer::initialize_index_article($topic); |
| 117 | - } catch (midcom_error $e) { |
|
| 117 | + } |
|
| 118 | + catch (midcom_error $e) { |
|
| 118 | 119 | // Could not create index |
| 119 | 120 | $topic->delete(); |
| 120 | 121 | throw $e; |
@@ -218,7 +218,8 @@ |
||
| 218 | 218 | if ($this->_config->get('comments_topic')) { |
| 219 | 219 | try { |
| 220 | 220 | $comments_topic = new midcom_db_topic($this->_config->get('comments_topic')); |
| 221 | - } catch (midcom_error $e) { |
|
| 221 | + } |
|
| 222 | + catch (midcom_error $e) { |
|
| 222 | 223 | return false; |
| 223 | 224 | } |
| 224 | 225 | |
@@ -408,7 +408,8 @@ |
||
| 408 | 408 | //Get the parent object |
| 409 | 409 | try { |
| 410 | 410 | $parent = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
| 411 | - } catch (midcom_error $e) { |
|
| 411 | + } |
|
| 412 | + catch (midcom_error $e) { |
|
| 412 | 413 | $e->log(); |
| 413 | 414 | return false; |
| 414 | 415 | } |
@@ -296,7 +296,8 @@ |
||
| 296 | 296 | // the tree. This is, for example, used by the on-delete cache invalidation. |
| 297 | 297 | try { |
| 298 | 298 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
| 299 | - } catch (midcom_error $e) { |
|
| 299 | + } |
|
| 300 | + catch (midcom_error $e) { |
|
| 300 | 301 | debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN); |
| 301 | 302 | } |
| 302 | 303 | if (!empty($object)) { |