瀏覽代碼

Various improvements/fixes

- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
tags/2019.01
Hypolite Petovan 1 年之前
父節點
當前提交
38109665c7
共有 3 個文件被更改,包括 15 次插入14 次删除
  1. +1
    -0
      include/conversation.php
  2. +13
    -13
      src/Core/Renderer.php
  3. +1
    -1
      view/theme/smoothly/style.css

+ 1
- 0
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];


+ 13
- 13
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");


+ 1
- 1
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;


Loading…
取消
儲存