Move delimiter props and functions

move left and right delimiter functions and properties to Render class.

diff --git a/src/App.php b/src/App.php
index a301fa0b291095112e942d948df5d1de175cfbf9..deb15f702c5dbc98713c34ab523bc7ad622bdf3b 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -162,14 +162,6 @@ class App
        public $template_engine_instance = [];
        public $process_id;
        public $queue;
-       private $ldelim = [
-               'internal' => '',
-               'smarty3' => '{{'
-       ];
-       private $rdelim = [
-               'internal' => '',
-               'smarty3' => '}}'
-       ];
        private $scheme;
        private $hostname;
 
@@ -924,38 +916,6 @@ class App
                $this->theme['template_engine'] = $engine;
        }
 
-       /**
-        * Gets the right delimiter for a template engine
-        *
-        * Currently:
-        * Internal = ''
-        * Smarty3 = '{{'
-        *
-        * @param string $engine The template engine (default is Smarty3)
-        *
-        * @return string the right delimiter
-        */
-       public function getTemplateLeftDelimiter($engine = 'smarty3')
-       {
-               return $this->ldelim[$engine];
-       }
-
-       /**
-        * Gets the left delimiter for a template engine
-        *
-        * Currently:
-        * Internal = ''
-        * Smarty3 = '}}'
-        *
-        * @param string $engine The template engine (default is Smarty3)
-        *
-        * @return string the left delimiter
-        */
-       public function getTemplateRightDelimiter($engine = 'smarty3')
-       {
-               return $this->rdelim[$engine];
-       }
-
        /**
         * Saves a timestamp for a value - f.e. a call
         * Necessary for profiling Friendica

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 70f98059b12ee0d83cf25107f797d8d9d0095389..378652fe26b65942ee4c47ee413cfabd3d41245b 100644 (file)
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -15,6 +15,15 @@ use Friendica\Render\FriendicaSmarty;
  */
 class Renderer extends BaseObject
 {
+    private static $ldelim = [
+               'internal' => '',
+               'smarty3' => '{{'
+       ];
+       private static $rdelim = [
+               'internal' => '',
+               'smarty3' => '}}'
+    ];
+    
     /**
      * @brief This is our template processor
      *
@@ -69,4 +78,36 @@ class Renderer extends BaseObject
 
         return $template;
     }
+
+    /**
+        * Gets the right delimiter for a template engine
+        *
+        * Currently:
+        * Internal = ''
+        * Smarty3 = '{{'
+        *
+        * @param string $engine The template engine (default is Smarty3)
+        *
+        * @return string the right delimiter
+        */
+       public static function getTemplateLeftDelimiter($engine = 'smarty3')
+       {
+               return self::$ldelim[$engine];
+       }
+
+       /**
+        * Gets the left delimiter for a template engine
+        *
+        * Currently:
+        * Internal = ''
+        * Smarty3 = '}}'
+        *
+        * @param string $engine The template engine (default is Smarty3)
+        *
+        * @return string the left delimiter
+        */
+       public static function getTemplateRightDelimiter($engine = 'smarty3')
+       {
+               return self::$rdelim[$engine];
+       }
 }

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 2052aa9e87a6f5627948d99d18b6464dcb3af8a9..e544a76d1bd4fb562fbf8a82f27798bd3bd09b07 100644 (file)
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -5,6 +5,7 @@
 namespace Friendica\Render;
 
 use Smarty;
+use Friendica\Core\Renderer;
 
 /**
  * Friendica extension of the Smarty3 template engine
@@ -38,8 +39,8 @@ class FriendicaSmarty extends Smarty
                $this->setConfigDir('view/smarty3/config/');
                $this->setCacheDir('view/smarty3/cache/');
 
-               $this->left_delimiter = $a->getTemplateLeftDelimiter('smarty3');
-               $this->right_delimiter = $a->getTemplateRightDelimiter('smarty3');
+               $this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
+               $this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
 
                // Don't report errors so verbosely
                $this->error_reporting = E_ALL & ~E_NOTICE;