Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 04:17:09 +02:00
Code Issues Packages Projects Releases Activity

Renamed media func to avoid conflict

Browse Source
This commit is contained in:
Andy Miller
2017-06-27 15:41:28 -06:00
parent e14ab682fd
commit 2b7707a6a0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -129,7 +129,7 @@ class TwigExtension extends \Twig_Extension
new \Twig_SimpleFunction('range', [$this, 'rangeFunc']),
new \Twig_SimpleFunction('isajaxrequest', [$this, 'isAjaxFunc']),
new \Twig_SimpleFunction('exif', [$this, 'exifFunc']),
new \Twig_SimpleFunction('media', [$this, 'mediaFunc']),
new \Twig_SimpleFunction('media_directory', [$this, 'mediaDirFunc']),
];
}
@@ -447,7 +447,7 @@ class TwigExtension extends \Twig_Extension
} else if ($now == $unix_date) {
$tense = $this->grav['language']->translate('NICETIME.JUST_NOW', null, false);
} else {
$difference = $unix_date - $now;
$tense = $this->grav['language']->translate('NICETIME.FROM_NOW', null, true);
@@ -472,7 +472,7 @@ class TwigExtension extends \Twig_Extension
}
$periods[$j] = $this->grav['language']->translate($periods[$j], null, true);
if ($now == $unix_date) {
return "{$tense}";
}
@@ -1012,7 +1012,7 @@ class TwigExtension extends \Twig_Extension
* @param $media_dir
* @return Media
*/
public function mediaFunc($media_dir)
public function mediaDirFunc($media_dir)
{
/** @var UniformResourceLocator $locator */
$locator = $this->grav['locator'];