Merge branch 'master' into horde_5_2

horde · Nov 10, 2013 · c05991b · c05991b
2 parents 6057684 + 3902b43
commit c05991b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
@@ -472,12 +472,11 @@ abstract public function deleteFolder($id, $parent = Horde_ActiveSync::FOLDER_RO
      *                             @since 2.9.0 (@todo Look at this for H6. It's
      *                             here now to save an extra DB lookup for data
      *                             we already have.)
-     * @param  integer $type       The EAS Folder type. @since 2.9.0
      *
      * @return Horde_ActiveSync_Message_Folder
      * @throws  Horde_ActiveSync_Exception
      */
-    abstract public function changeFolder($id, $displayname, $parent, $uid = null, $type = null);
+    abstract public function changeFolder($id, $displayname, $parent, $uid = null);
 
     /**
      * Move message

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php
@@ -80,7 +80,7 @@ public function deleteFolder($id, $parent = Horde_ActiveSync::FOLDER_ROOT) {  }
      *                             here now to save an extra DB lookup for data
      *                             we already have.)
      */
-    public function changeFolder($id, $displayname, $parent, $uid = null, $type = null)
+    public function changeFolder($id, $displayname, $parent, $uid = null)
     {
         return $uid;
     }

diff --git a/hermes/js/hermes.js b/hermes/js/hermes.js
@@ -801,7 +801,7 @@ HermesCore = {
         h -= over;
 
         var cell = $('hermesStatText').down('th');
-        cell.update(h);
+        cell.update(h + over);
         cell = cell.next().update(budget);
         cell.next().update(budget - (h + over));
 
@@ -877,7 +877,7 @@ HermesCore = {
      },
 
     /**
-     * Draws the house by type chart.
+     * Draws the hours by type chart.
      *
      * @param array  The data.
      */