bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8545 from nupplaphil/bug/subdir

Browse source 
Template Engine with Subdirectory
This commit is contained in:
Hypolite Petovan 2020-04-26 14:31:30 -04:00 committed by GitHub
parent 1b8918351d f5f62d3f42
commit 1b0a8ec5c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Core/Renderer.php
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();

8
src/DI.php
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
*/

8
src/Render/FriendicaSmartyEngine.php
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;

2
src/Render/ITemplateEngine.php
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 = '');
}