Various improvements/fixes

- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly

diff --git a/include/conversation.php b/include/conversation.php
index b129b7d14d075a492a226355b5bb20b1a4783b66..d6ad4f11b6c420b7be9864b97697c6e8cfdd12c9 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -994,6 +994,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 function format_like($cnt, array $arr, $type, $id) {
        $o = '';
        $expanded = '';
+       $phrase = '';
 
        if ($cnt == 1) {
                $likers = $arr[0];

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 44b56fcba373afda90354e624efb2740db7070db..2ca91b4b6ce3d72818467fc5387777f431e504d7 100644 (file)
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -48,29 +48,29 @@ class Renderer extends BaseObject
                'internal' => '',
                'smarty3' => '}}'
     ];
-    
-    /**
-     * @brief This is our template processor
-     *
-     * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
-     * @param array $r                  key value pairs (search => replace)
-     * 
-     * @return string substituted string
-    */
-    public static function replaceMacros($s, $r)
+
+       /**
+        * @brief This is our template processor
+        *
+        * @param string|FriendicaSmarty $s    The string requiring macro substitution or an instance of FriendicaSmarty
+        * @param array                  $vars key value pairs (search => replace)
+        *
+        * @return string substituted string
+        */
+    public static function replaceMacros($s, $vars)
     {
         $stamp1 = microtime(true);
         $a = self::getApp();
 
         // pass $baseurl to all templates
-        $r['$baseurl'] = System::baseUrl();
+        $vars['$baseurl'] = System::baseUrl();
         $t = self::getTemplateEngine();
 
         try {
-            $output = $t->replaceMacros($s, $r);
+            $output = $t->replaceMacros($s, $vars);
         } catch (Exception $e) {
             echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-            killme();
+            exit();
         }
 
         $a->saveTimestamp($stamp1, "rendering");

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 0907237871ffbc3ad3ce954171ebdfe415793c53..9866bc362a3b2b82d06db8bc67ccb4bfd912bd20 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -20,7 +20,7 @@ Orange - #fec01d
 /* For general iPad layouts */
 #body {
        -moz-background-clip: border;
-       -moz-background-origin: pdading;
+       -moz-background-origin: padding;
        -moz-background-size: auto auto;
        background-attachment: scroll;
        background-color: transparent;