From 08f9cd844831f9b6088301fbd08944b02809f676 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Wed, 27 Sep 2017 22:15:01 -0600
Subject: [PATCH] Moved the |media twig filter from the CMS module to the
 System module

---
 modules/cms/classes/Controller.php | 10 ----------
 modules/cms/twig/Extension.php     | 11 -----------
 modules/system/twig/Extension.php  | 12 ++++++++++++
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 8d9e9a9d7..b2b7852c6 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -1191,16 +1191,6 @@ class Controller
         return $_url;
     }
 
-    /**
-     * Converts supplied file to a URL relative to the media library.
-     * @param string $file Specifies the media-relative file
-     * @return string
-     */
-    public function mediaUrl($file = null)
-    {
-        return MediaLibrary::url($file);
-    }
-
     /**
      * Returns a routing parameter.
      * @param string $name Routing parameter name.
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 79725d046..8d6451f83 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -59,7 +59,6 @@ class Extension extends Twig_Extension
         return [
             new Twig_SimpleFilter('page', [$this, 'pageFilter'], ['is_safe' => ['html']]),
             new Twig_SimpleFilter('theme', [$this, 'themeFilter'], ['is_safe' => ['html']]),
-            new Twig_SimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]),
         ];
     }
 
@@ -176,16 +175,6 @@ class Extension extends Twig_Extension
         return $this->controller->themeUrl($url);
     }
 
-    /**
-     * Converts supplied file to a URL relative to the media library.
-     * @param string $file Specifies the media-relative file
-     * @return string
-     */
-    public function mediaFilter($file)
-    {
-        return $this->controller->mediaUrl($file);
-    }
-
     /**
      * Opens a layout block.
      * @param string $name Specifies the block name
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 6d921d037..0a152d1c6 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -6,6 +6,7 @@ use Twig_TokenParser;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use ApplicationException;
+use System\Classes\MediaLibary;
 use System\Classes\MarkupManager;
 
 /**
@@ -56,6 +57,7 @@ class Extension extends Twig_Extension
     {
         $filters = [
             new Twig_SimpleFilter('app', [$this, 'appFilter'], ['is_safe' => ['html']]),
+            new Twig_SimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]),
         ];
 
         /*
@@ -92,4 +94,14 @@ class Extension extends Twig_Extension
     {
         return Url::to($url);
     }
+
+    /**
+     * Converts supplied file to a URL relative to the media library.
+     * @param string $file Specifies the media-relative file
+     * @return string
+     */
+    public function mediaFilter($file)
+    {
+        return MediaLibrary::url($file);
+    }
 }