Fix Notice: Array to string conversion in Zend/Filter/StringTrim.php z…

…endframework#711
tavy315 · Sep 13, 2016 · c53c06f · c53c06f
1 parent ba7d7f8
commit c53c06f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/library/Zend/Filter/StringTrim.php b/library/Zend/Filter/StringTrim.php
@@ -46,13 +46,12 @@ class Zend_Filter_StringTrim implements Zend_Filter_Interface
      * Sets filter options
      *
      * @param  string|array|Zend_Config $options
-     * @return void
      */
     public function __construct($options = null)
     {
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
-        } else if (!is_array($options)) {
+        } elseif (!is_array($options)) {
             $options          = func_get_args();
             $temp['charlist'] = array_shift($options);
             $options          = $temp;
@@ -95,6 +94,9 @@ public function setCharList($charList)
      */
     public function filter($value)
     {
+        if (!is_string($value)) {
+            return $value;
+        }
         if (null === $this->_charList) {
             return $this->_unicodeTrim((string) $value);
         } else {