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

Conflicts:
	js/post-hider.js

1 files changed, 13 insertions, 2 deletions

diff --git a/inc/lib/Twig/Error/Loader.php b/inc/lib/Twig/Error/Loader.php
index 418a7760..68efb574 100644
--- a/inc/lib/Twig/Error/Loader.php
+++ b/inc/lib/Twig/Error/Loader.php
@@ -12,9 +12,20 @@
 /**
  * Exception thrown when an error occurs during template loading.
  *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
+ * Automatic template information guessing is always turned off as
+ * if a template cannot be loaded, there is nothing to guess.
+ * However, when a template is loaded from another one, then, we need
+ * to find the current context and this is automatically done by
+ * Twig_Template::displayWithErrorHandling().
+ *
+ * This strategy makes Twig_Environment::resolveTemplate() much faster.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Error_Loader extends Twig_Error
 {
+    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
+    {
+        parent::__construct($message, false, false, $previous);
+    }
 }