Clean up some typos

diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
index 0935bf4..89a7691 100644 (file)
--- a/imp/lib/Ajax/Application.php
+++ b/imp/lib/Ajax/Application.php
@@ -1978,7 +1978,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
     /**
      * Create an object used by DimpCore to generate the folder tree.
      *
-     * @param IMP_Imap_Tree_Elt $elt  An element object.
+     * @param IMP_Imap_Tree_Element $elt  An element object.
      *
      * @return stdClass  The element object. Contains the following items:
      * <pre>
@@ -2003,11 +2003,11 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
      *                 2 = user vfolder [integer] [DEFAULT: 0]
      * </pre>
      */
-    protected function _createMailboxElt(IMP_Imap_Tree_Elt $elt)
+    protected function _createMailboxElt(IMP_Imap_Tree_Element $elt)
     {
         $ob = new stdClass;
 
-        if ($ob->children) {
+        if ($elt->children) {
             $ob->ch = 1;
         }
         $ob->m = $elt->value;
@@ -2041,7 +2041,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
         } else {
             if ($elt->polled) {
                 $poll_info = $elt->poll_info;
-                $ob->u = $poll_info['unseen'];
+                $ob->u = $poll_info->unseen;
             }
 
             if ($elt->special) {
@@ -2061,7 +2061,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
                 ? $icon->icon
                 : $dir . '/' . $icon->icon;
         } else {
-            $ob->cl = $icon['class'];
+            $ob->cl = $icon->class;
         }
 
         return $ob;

diff --git a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
index 28e33fa..d62b47e 100644 (file)
--- a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
+++ b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
@@ -28,7 +28,7 @@ class IMP_LoginTasks_SystemTask_UpgradeFromImp4 extends Horde_LoginTasks_SystemT
     {
         $this->_upgradeAbookPrefs();
         $this->_upgradeForwardPrefs();
-        $this->_upgradeLoginTasks();
+        $this->_upgradeLoginTasksPrefs();
         $this->_upgradeSortPrefs();
         $this->_upgradeVirtualFolders();
     }
@@ -106,7 +106,7 @@ class IMP_LoginTasks_SystemTask_UpgradeFromImp4 extends Horde_LoginTasks_SystemT
     /**
      * Upgrade to the new login tasks preferences.
      */
-    protected function _upgradeForwardPrefs()
+    protected function _upgradeLoginTasksPrefs()
     {
         global $prefs;