@@ -95,7 +95,8 @@ |
||
| 95 | 95 | org_openpsa_projects_workflow::accept($task, 0, $this->comment); |
| 96 | 96 | return; |
| 97 | 97 | } |
| 98 | - } catch (midcom_error $e) { |
|
| 98 | + } |
|
| 99 | + catch (midcom_error $e) { |
|
| 99 | 100 | $e->log(); |
| 100 | 101 | } |
| 101 | 102 | } |
@@ -165,7 +165,8 @@ |
||
| 165 | 165 | try { |
| 166 | 166 | self::$root_topic = midcom_db_topic::get_cached($guid); |
| 167 | 167 | return self::$root_topic; |
| 168 | - } catch (midcom_error $e) { |
|
| 168 | + } |
|
| 169 | + catch (midcom_error $e) { |
|
| 169 | 170 | if ($e instanceof midcom_error_forbidden) { |
| 170 | 171 | throw $e; |
| 171 | 172 | } |
@@ -72,7 +72,8 @@ |
||
| 72 | 72 | $component = key($watch); |
| 73 | 73 | try { |
| 74 | 74 | $interface = $this->loader->get_interface_class($component); |
| 75 | - } catch (\midcom_error $e) { |
|
| 75 | + } |
|
| 76 | + catch (\midcom_error $e) { |
|
| 76 | 77 | debug_add("Failed to load the component {$component}: " . $e->getMessage(), MIDCOM_LOG_INFO); |
| 77 | 78 | continue; |
| 78 | 79 | } |
@@ -409,7 +409,8 @@ |
||
| 409 | 409 | foreach ($this->_articles as $article_counter => $article) { |
| 410 | 410 | try { |
| 411 | 411 | $data['datamanager']->set_storage($article); |
| 412 | - } catch (midcom_error $e) { |
|
| 412 | + } |
|
| 413 | + catch (midcom_error $e) { |
|
| 413 | 414 | $e->log(); |
| 414 | 415 | continue; |
| 415 | 416 | } |
@@ -50,9 +50,11 @@ |
||
| 50 | 50 | $filepath = $this->generate_filename(); |
| 51 | 51 | try { |
| 52 | 52 | $this->exec('co -q -f -r' . escapeshellarg(trim($revision)) . " {$filepath} 2>/dev/null"); |
| 53 | - } catch (midcom_error $e) { |
|
| 53 | + } |
|
| 54 | + catch (midcom_error $e) { |
|
| 54 | 55 | $e->log(); |
| 55 | - } finally { |
|
| 56 | + } |
|
| 57 | + finally { |
|
| 56 | 58 | if (!file_exists($filepath)) { |
| 57 | 59 | return []; |
| 58 | 60 | } |
@@ -55,7 +55,8 @@ |
||
| 55 | 55 | { |
| 56 | 56 | try { |
| 57 | 57 | return eval("return [{$data}\n];"); |
| 58 | - } catch (ParseError $e) { |
|
| 58 | + } |
|
| 59 | + catch (ParseError $e) { |
|
| 59 | 60 | throw new midcom_error('Failed to parse config data: ' . $e->getMessage() . ' in ' . $path . ' line ' . $e->getLine()); |
| 60 | 61 | } |
| 61 | 62 | } |
@@ -79,7 +79,8 @@ discard block |
||
| 79 | 79 | try { |
| 80 | 80 | $dms['group']->set_storage($group); |
| 81 | 81 | org_openpsa_products_viewer::index($dms['group'], $indexer, $topic, $config); |
| 82 | - } catch (midcom_error $e) { |
|
| 82 | + } |
|
| 83 | + catch (midcom_error $e) { |
|
| 83 | 84 | $e->log(MIDCOM_LOG_WARN); |
| 84 | 85 | } |
| 85 | 86 | } |
@@ -91,7 +92,8 @@ discard block |
||
| 91 | 92 | try { |
| 92 | 93 | $dms['product']->set_storage($product); |
| 93 | 94 | org_openpsa_products_viewer::index($dms['product'], $indexer, $topic, $config); |
| 94 | - } catch (midcom_error $e) { |
|
| 95 | + } |
|
| 96 | + catch (midcom_error $e) { |
|
| 95 | 97 | $e->log(MIDCOM_LOG_WARN); |
| 96 | 98 | } |
| 97 | 99 | } |
@@ -48,7 +48,8 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | try { |
| 50 | 50 | $folder = midcom_db_topic::get_cached($this->topic); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | $e->log(); |
| 53 | 54 | } |
| 54 | 55 | $folder->delete_attachment(self::FOLDER_THUMBNAIL); |
@@ -58,7 +59,8 @@ discard block |
||
| 58 | 59 | { |
| 59 | 60 | try { |
| 60 | 61 | return new midcom_db_attachment($this->$type); |
| 61 | - } catch (midcom_error $e) { |
|
| 62 | + } |
|
| 63 | + catch (midcom_error $e) { |
|
| 62 | 64 | $e->log(); |
| 63 | 65 | return null; |
| 64 | 66 | } |
@@ -104,7 +104,8 @@ |
||
| 104 | 104 | { |
| 105 | 105 | $ret = ['org_openpsa_relatedto' => []]; |
| 106 | 106 | foreach ($array as $rel) { |
| 107 | - if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto' |
|
| 107 | + if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { |
|
| 108 | +//Matches also 'org_openpsa_relatedto' |
|
| 108 | 109 | //Wrong type of object found in array, cruelly abort the whole procedure |
| 109 | 110 | return null; |
| 110 | 111 | } |