Merge branch 'master' of github.com:vichan-devel/Tinyboard

Conflicts:
	js/post-hider.js

1 files changed, 15 insertions, 7 deletions

diff --git a/inc/lib/Twig/FilterInterface.php b/inc/lib/Twig/FilterInterface.php
index 4ac19ceb..5319ecc9 100644
--- a/inc/lib/Twig/FilterInterface.php
+++ b/inc/lib/Twig/FilterInterface.php
@@ -12,8 +12,10 @@
 /**
  * Represents a template filter.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_FilterInterface
 {
@@ -22,13 +24,19 @@ interface Twig_FilterInterface
      *
      * @return string The PHP code for the filter
      */
-    function compile();
+    public function compile();
+
+    public function needsEnvironment();
+
+    public function needsContext();
+
+    public function getSafe(Twig_Node $filterArgs);
 
-    function needsEnvironment();
+    public function getPreservesSafety();
 
-    function needsContext();
+    public function getPreEscape();
 
-    function getSafe(Twig_Node $filterArgs);
+    public function setArguments($arguments);
 
-    function getPreEscape();
+    public function getArguments();
 }