fixed login problem with chrome 37+

[contagged] / inc / fields.php

diff --git a/inc/fields.php b/inc/fields.php
index 9d097436a2a88aef28fe4c0246fe922761ef7766..0c236be696a51d1d33b7c4cf5938f15719736cc2 100644 (file)
--- a/inc/fields.php
+++ b/inc/fields.php
@@ -38,7 +38,7 @@ $FIELDS = array(
     'homephone'    => 'homePhone',
     'homestreet'   => 'homePostalAddress',
     'photo'        => 'jpegPhoto',
-    'url'          => 'labeledURI',
+    '_url'         => 'labeledURI',
     'note'         => 'description',
     'manager'      => 'manager',                     // aka. key account
     '_mail'        => 'mail',
@@ -87,6 +87,9 @@ if (array_search('evolutionPerson', $conf['oclasses']) !== false) {
     $FIELDS['_marker']     = 'categories'; // aka. tags
 }
 
+// add custom fields from config
+$FIELDS = array_merge($FIELDS, $conf['customFields']);
+
 /**
  * Flip the array
  */