@@ -64,8 +64,7 @@ |
||
64 | 64 | $compiler->findBlock('dynamic'); |
65 | 65 | |
66 | 66 | return $content; |
67 | - } |
|
68 | - catch (CompilationException $e) { |
|
67 | + } catch (CompilationException $e) { |
|
69 | 68 | } |
70 | 69 | $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t"; |
71 | 70 | if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) { |
@@ -66,11 +66,9 @@ |
||
66 | 66 | |
67 | 67 | try { |
68 | 68 | $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id); |
69 | - } |
|
70 | - catch (SecurityException $e) { |
|
69 | + } catch (SecurityException $e) { |
|
71 | 70 | $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING); |
72 | - } |
|
73 | - catch (Exception $e) { |
|
71 | + } catch (Exception $e) { |
|
74 | 72 | $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING); |
75 | 73 | } |
76 | 74 |
@@ -95,11 +95,9 @@ |
||
95 | 95 | |
96 | 96 | try { |
97 | 97 | $parent = $compiler->getCore()->templateFactory($resource, $identifier, null, null, null, $curTpl); |
98 | - } |
|
99 | - catch (SecurityException $e) { |
|
98 | + } catch (SecurityException $e) { |
|
100 | 99 | throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage()); |
101 | - } |
|
102 | - catch (Exception $e) { |
|
100 | + } catch (Exception $e) { |
|
103 | 101 | throw new CompilationException($compiler, 'Extends : ' . $e->getMessage()); |
104 | 102 | } |
105 | 103 |
@@ -50,8 +50,7 @@ |
||
50 | 50 | if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) { |
51 | 51 | try { |
52 | 52 | $compiler->getCore()->getLoader()->loadPlugin('if'); |
53 | - } |
|
54 | - catch (Exception $e) { |
|
53 | + } catch (Exception $e) { |
|
55 | 54 | throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif'); |
56 | 55 | } |
57 | 56 | } |
@@ -592,8 +592,7 @@ |
||
592 | 592 | if (!class_exists($class) && !function_exists($class)) { |
593 | 593 | try { |
594 | 594 | $this->getLoader()->loadPlugin($callback); |
595 | - } |
|
596 | - catch (Exception $e) { |
|
595 | + } catch (Exception $e) { |
|
597 | 596 | if (strstr($callback, self::NAMESPACE_PLUGINS_FILTERS)) { |
598 | 597 | throw new Exception('Wrong filter name : ' . $callback . ', the "Filter" prefix should not be used, please only use "' . str_replace('Filter', '', $callback) . '"'); |
599 | 598 | } else { |
@@ -478,8 +478,7 @@ discard block |
||
478 | 478 | if (!class_exists($class) && !function_exists($class)) { |
479 | 479 | try { |
480 | 480 | $this->getCore()->getLoader()->loadPlugin($name); |
481 | - } |
|
482 | - catch (Exception $e) { |
|
481 | + } catch (Exception $e) { |
|
483 | 482 | throw new Exception('Processor ' . $name . ' could not be found in your plugin directories, please ensure it is in a file named ' . $name . '.php in the plugin directory'); |
484 | 483 | } |
485 | 484 | } |
@@ -1632,8 +1631,7 @@ discard block |
||
1632 | 1631 | // load if plugin |
1633 | 1632 | try { |
1634 | 1633 | $this->getPluginType('if'); |
1635 | - } |
|
1636 | - catch (Exception $e) { |
|
1634 | + } catch (Exception $e) { |
|
1637 | 1635 | throw new CompilationException($this, 'Assignments require the "if" plugin to be accessible'); |
1638 | 1636 | } |
1639 | 1637 | |
@@ -3454,8 +3452,7 @@ discard block |
||
3454 | 3452 | if ($pluginType === - 1) { |
3455 | 3453 | try { |
3456 | 3454 | $this->getCore()->getLoader()->loadPlugin('Plugin' . Core::toCamelCase($name)); |
3457 | - } |
|
3458 | - catch (Exception $e) { |
|
3455 | + } catch (Exception $e) { |
|
3459 | 3456 | if (isset($phpFunc)) { |
3460 | 3457 | $pluginType = Core::NATIVE_PLUGIN; |
3461 | 3458 | } elseif (is_object($this->getCore()->getPluginProxy()) && $this->getCore()->getPluginProxy()->handles($name)) { |