Merge branch 'sabredav_1.6'

1 files changed, 13 insertions, 12 deletions

diff --git a/3rdparty/Sabre/DAV/Exception.php b/3rdparty/Sabre/DAV/Exception.php
index 61f8b87c0a6..a2cd6cf5820 100644..100755
--- a/3rdparty/Sabre/DAV/Exception.php
+++ b/3rdparty/Sabre/DAV/Exception.php
@@ -7,42 +7,42 @@
  *
  * @package Sabre
  * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
  * @author Evert Pot (http://www.rooftopsolutions.nl/) 
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 
 /**
- * Main Exception class. 
+ * Main Exception class.
  *
- * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occured.
+ * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occurred.
  * The default for this is 500.
  *
  * This class also allows you to generate custom xml data for your exceptions. This will be displayed
  * in the 'error' element in the failing response.
  */
-class Sabre_DAV_Exception extends Exception { 
+class Sabre_DAV_Exception extends Exception {
 
     /**
-     * Returns the HTTP statuscode for this exception 
+     * Returns the HTTP statuscode for this exception
      *
      * @return int
      */
-    public function getHTTPCode() { 
+    public function getHTTPCode() {
 
         return 500;
 
     }
 
     /**
-     * This method allows the exception to include additonal information into the WebDAV error response 
+     * This method allows the exception to include additional information into the WebDAV error response
      *
      * @param Sabre_DAV_Server $server
-     * @param DOMElement $errorNode 
+     * @param DOMElement $errorNode
      * @return void
      */
     public function serialize(Sabre_DAV_Server $server,DOMElement $errorNode) {
-    
+
 
     }
 
@@ -50,14 +50,15 @@ class Sabre_DAV_Exception extends Exception {
      * This method allows the exception to return any extra HTTP response headers.
      *
      * The headers must be returned as an array.
-     * 
-     * @return array 
+     *
+     * @param Sabre_DAV_Server $server
+     * @return array
      */
     public function getHTTPHeaders(Sabre_DAV_Server $server) {
 
         return array();
 
-    } 
+    }
 
 }