Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_beta2 Conflicts: library/Zend/Cache/Cache.php
zendframework · Dec 12, 2011 · 57f9269 · 57f9269
commit 57f9269
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 220 deletions.
diff --git a/src/Hostname/Biz.php b/src/Hostname/Biz.php
@@ -24,7 +24,7 @@
 namespace Zend\Validator\Hostname;
 
 /**
- * Ressource file for biz idn validation
+ * Resource file for biz idn validation
  *
  * @category   Zend
  * @package    Zend_Validate

diff --git a/src/Hostname/Cn.php b/src/Hostname/Cn.php
@@ -24,7 +24,7 @@
 namespace Zend\Validator\Hostname;
 
 /**
- * Ressource file for chinese idn validation
+ * Resource file for chinese idn validation
  *
  * @category   Zend
  * @package    Zend_Validate

diff --git a/src/Hostname/Jp.php b/src/Hostname/Jp.php
@@ -24,7 +24,7 @@
 namespace Zend\Validator\Hostname;
 
 /**
- * Ressource file for japanese idn validation
+ * Resource file for japanese idn validation
  *
  * @category   Zend
  * @package    Zend_Validate

diff --git a/src/Identical.php b/src/Identical.php
@@ -84,6 +84,8 @@ public function __construct($token = null)
         } elseif (null !== $token) {
             $this->setToken($token);
         }
+
+        parent::__construct(is_array($token) ? $token : null);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,6 +84,8 @@ public function __construct($token = null) @@
             } elseif (null !== $token) {
                 $this->setToken($token);
             }
+            parent::__construct(is_array($token) ? $token : null);
         }
         /**
@@ Expand Down @@