Merge remote-tracking branch 'upstream/develop' into write-tags

This commit is contained in:
Michael 2020-04-26 18:47:24 +00:00
commit 9fb035ee79
6 changed files with 24 additions and 9 deletions

View file

@ -99,19 +99,18 @@ class Renderer
* Load a given template $s
*
* @param string $s Template to load.
* @param string $root Optional.
* @param string $subDir Subdirectory (Optional)
*
* @return string template.
* @throws Exception
*/
public static function getMarkupTemplate($s, $root = '')
public static function getMarkupTemplate($s, $subDir = '')
{
$stamp1 = microtime(true);
$a = DI::app();
$t = self::getTemplateEngine();
try {
$template = $t->getTemplateFile($s, $root);
$template = $t->getTemplateFile($s, $subDir);
} catch (Exception $e) {
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
exit();

View file

@ -383,6 +383,14 @@ abstract class DI
return self::$dice->create(Util\ACLFormatter::class);
}
/**
* @return string
*/
public static function basePath()
{
return self::$dice->create('$basepath');
}
/**
* @return Util\DateTimeFormat
*/

View file

@ -28,7 +28,7 @@ use Friendica\DI;
class View
{
/**
* view definition loaded from config/dbview.config.php
* view definition loaded from static/dbview.config.php
*
* @var array
*/

View file

@ -68,16 +68,18 @@ class FriendicaSmartyEngine implements ITemplateEngine
return $s->parsed($template);
}
public function getTemplateFile($file, $root = '')
public function getTemplateFile($file, $subDir = '')
{
$a = DI::app();
$template = new FriendicaSmarty();
// Make sure $root ends with a slash /
if ($root !== '' && substr($root, -1, 1) !== '/') {
$root = $root . '/';
if ($subDir !== '' && substr($subDir, -1, 1) !== '/') {
$subDir = $subDir . '/';
}
$root = DI::basePath() . '/' . $subDir;
$theme = $a->getCurrentTheme();
$filename = $template::SMARTY3_TEMPLATE_FOLDER . '/' . $file;

View file

@ -27,5 +27,5 @@ namespace Friendica\Render;
interface ITemplateEngine
{
public function replaceMacros($s, $v);
public function getTemplateFile($file, $root = '');
public function getTemplateFile($file, $subDir = '');
}

View file

@ -256,6 +256,12 @@ return [
'wall' => 1,
],
],
'profile' => [
[
'id' => 1,
'uid' => 42,
],
],
'group' => [
[
'id' => 1,