Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2

cakephp · Nov 3, 2009 · 74edb05 · 74edb05
2 parents 133299c + d63218c
commit 74edb05
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
@@ -433,7 +433,7 @@ function counter($options = array()) {
 		$options = array_merge(
 			array(
 				'model' => $this->defaultModel(),
-				'format' => 'pages'
+				'format' => 'pages',
 				'separator' => __(' of ', true)
 			),
 		$options);