Merge pull request fuel#40 from billmn/1.1/develop

Jelmer Schreuder · Jelmer Schreuder · commit a37c423d37b4 · 2012-03-19T08:22:40.000-07:00
Fixed delimiters passed to Twig_Lexer and updated copyright
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,15 @@
+*~
+*.bak
+Thumbs.db
+desktop.ini
+.DS_Store
+.buildpath
+.project
+.settings
+fuel/app/logs/*/*/*
+fuel/app/cache/*/*
+nbproject/
+.idea
+*.tmproj
+*.sublime-project
+*.sublime-workspace
diff --git a/bootstrap.php b/bootstrap.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/twig/fuel/extension.php b/classes/twig/fuel/extension.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view.php b/classes/view.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/dwoo.php b/classes/view/dwoo.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/haml.php b/classes/view/haml.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/jade.php b/classes/view/jade.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/markdown.php b/classes/view/markdown.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/mustache.php b/classes/view/mustache.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/phptal.php b/classes/view/phptal.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/smarty.php b/classes/view/smarty.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     b3ha
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
diff --git a/classes/view/twig.php b/classes/view/twig.php
@@ -8,7 +8,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
@@ -84,11 +84,11 @@ public static function parser()
 		if (isset($twig_lexer_conf))
 		{
 			isset($twig_lexer_conf['tag_block'])
-				and $twig_lexer_conf['tag_block'] = array_keys($twig_lexer_conf['tag_block']);
+				and $twig_lexer_conf['tag_block'] = array_values($twig_lexer_conf['tag_block']);
 			isset($twig_lexer_conf['tag_comment'])
-				and $twig_lexer_conf['tag_comment'] = array_keys($twig_lexer_conf['tag_comment']);
+				and $twig_lexer_conf['tag_comment'] = array_values($twig_lexer_conf['tag_comment']);
 			isset($twig_lexer_conf['tag_variable'])
-				and $twig_lexer_conf['tag_variable'] = array_keys($twig_lexer_conf['tag_variable']);
+				and $twig_lexer_conf['tag_variable'] = array_values($twig_lexer_conf['tag_variable']);
 
 			$twig_lexer = new Twig_Lexer(static::$_parser, $twig_lexer_conf);
 			static::$_parser->setLexer($twig_lexer);
diff --git a/config/parser.php b/config/parser.php
@@ -6,7 +6,7 @@
  * @version    1.0
  * @author     Fuel Development Team
  * @license    MIT License
- * @copyright  2010 - 2011 Fuel Development Team
+ * @copyright  2010 - 2012 Fuel Development Team
  * @link       http://fuelphp.com
  */
 
