Explorar el Código

Fixes ZF-9331. Patch provided by @Hobodave

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21331 44c647ce-9c0f-0410-b52a-842ac1e357ba
freak hace 16 años
padre
commit
8f3c360b93
Se han modificado 2 ficheros con 25 adiciones y 10 borrados
  1. 5 5
      library/Zend/Dojo/View/Helper/Dojo/Container.php
  2. 20 5
      library/Zend/Log.php

+ 5 - 5
library/Zend/Dojo/View/Helper/Dojo/Container.php

@@ -268,11 +268,11 @@ class Zend_Dojo_View_Helper_Dojo_Container
                     $this->registerDojoStylesheet($value);
                     break;
                 case 'enable':
-                	if($value == 0) {
-                		$this->disable();
-                	} else {
-                		$this->enable();
-                	}
+                    if($value) {
+                        $this->enable();
+                    } else {
+                        $this->disable();
+                    }
             }
         }
 

+ 20 - 5
library/Zend/Log.php

@@ -227,6 +227,25 @@ class Zend_Log
     }
 
     /**
+     * Packs message and priority into Event array
+     *
+     * @param  string   $message   Message to log
+     * @param  integer  $priority  Priority of message
+     * @return array Event array
+     **/
+    protected function _packEvent($message, $priority)
+    {
+        return array_merge(array(
+            'timestamp'    => date('c'),
+            'message'      => $message,
+            'priority'     => $priority,
+            'priorityName' => $this->_priorities[$priority]
+            ),
+            $this->_extras
+        );
+    }
+
+    /**
      * Class destructor.  Shutdown log writers
      *
      * @return void
@@ -300,11 +319,7 @@ class Zend_Log
         }
 
         // pack into event required by filters and writers
-        $event = array_merge(array('timestamp'    => date('c'),
-                                    'message'      => $message,
-                                    'priority'     => $priority,
-                                    'priorityName' => $this->_priorities[$priority]),
-                              $this->_extras);
+        $event = $this->_packEvent($message, $priority);
 
         // Check to see if any extra information was passed
         if (!empty($extras)) {