fixed ldap exception for dev; fixed typo

mozilla · Oct 19, 2011 · 12fe547 · 12fe547
1 parent 39970e3
commit 12fe547
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 application/cache
 logs
 application/config/workermgmt.php
diff --git a/application/classes/filing.php b/application/classes/filing.php
@@ -268,7 +268,7 @@ public function construct_content() {
     public function file() {
         $filing_response = array();
         /**
-         * Take the user input an contruct the content for the bug filing
+         * Take the user input and construct the content for the bug filing
          */
         $this->construct_content();
         /**

diff --git a/modules/bugzilla/classes/ldap.php b/modules/bugzilla/classes/ldap.php
@@ -228,8 +228,10 @@ private function fetch_user_array($ldap_email, $attrbutes_to_return=array("*"))
         }
         // cleanup, convert to expected underscore format
         foreach ($search_results as &$result) {
-            $result['employee_type']=$result['employeetype'];
-            unset ($result['employeetype']);
+            if(isset($result['employeetype'])) {
+                $result['employee_type']=$result['employeetype'];
+                unset ($result['employeetype']);
+            }
             if(isset ($result['bugzillaemail'])) {
                 $result['bugzilla_email']=$result['bugzillaemail'];
                 unset ($result['bugzillaemail']);