kopia lustrzana https://github.com/friendica/friendica
Various improvements/fixes
- Fix potential missing variable - Improve replaceMacros doc - Fix CSS value in smoothlypull/6262/head
rodzic
2241ba4540
commit
38109665c7
|
@ -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];
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
|
|
Ładowanie…
Reference in New Issue