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

Conflicts:
	js/post-hider.js

1 files changed, 8 insertions, 3 deletions

diff --git a/inc/lib/Twig/Function/Method.php b/inc/lib/Twig/Function/Method.php
index 7328566e..67039a95 100644
--- a/inc/lib/Twig/Function/Method.php
+++ b/inc/lib/Twig/Function/Method.php
@@ -13,15 +13,20 @@
 /**
  * Represents a method 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)
  */
 class Twig_Function_Method extends Twig_Function
 {
-    protected $extension, $method;
+    protected $extension;
+    protected $method;
 
     public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
     {
+        $options['callable'] = array($extension, $method);
+
         parent::__construct($options);
 
         $this->extension = $extension;