Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css

1 files changed, 12 insertions, 6 deletions

diff --git a/inc/lib/Twig/FunctionInterface.php b/inc/lib/Twig/FunctionInterface.php
index ccc9fd93..67f4f89c 100644
--- a/inc/lib/Twig/FunctionInterface.php
+++ b/inc/lib/Twig/FunctionInterface.php
@@ -13,8 +13,10 @@
 /**
  * Represents a template function.
  *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @deprecated since 1.12 (to be removed in 2.0)
  */
 interface Twig_FunctionInterface
 {
@@ -23,11 +25,15 @@ interface Twig_FunctionInterface
      *
      * @return string The PHP code for the function
      */
-    function compile();
+    public function compile();
+
+    public function needsEnvironment();
+
+    public function needsContext();
 
-    function needsEnvironment();
+    public function getSafe(Twig_Node $filterArgs);
 
-    function needsContext();
+    public function setArguments($arguments);
 
-    function getSafe(Twig_Node $filterArgs);
+    public function getArguments();
 }