Remove php  dir as the purpose of it was to commit this patch which does
not apply in 4.2
713,720c713,720
<       if (is_array($fields)) {
<         // unset any email-* fields since we already collect it,
CRM-2888
<         foreach (array_keys($fields) as $fieldName) {
<           if (substr($fieldName, 0, 6) == 'email-') {
<             unset($fields[$fieldName]);
<           }
<         }
<       }
---
>       // if (is_array($fields)) {
>       //   // unset any email-* fields since we already collect it,
>       CRM-2888
>       //   foreach (array_keys($fields) as $fieldName) {
>       //     if (substr($fieldName, 0, 6) == 'email-') {
>       //       unset($fields[$fieldName]);
>       //     }
>       //   }
>       // }