Changeset 26626 for extensions/oAuth/maintain.inc.php

Timestamp:

Jan 11, 2014, 3:50:26 PM (10 years ago)

Author:

mistic100

Message:

add 'allow_merge_accounts' parameter

File:

• extensions/oAuth/maintain.inc.php (modified) (3 diffs)

extensions/oAuth/maintain.inc.php

@@ -11 +11 @@
     'identification_icon' => '38px',
     'menubar_icon' => '26px',
+    'allow_merge_accounts' => true,
     );
     
@@ -30 +31 @@
       $conf['oauth'] = serialize($this->default_conf);
       conf_update_param('oauth', $conf['oauth']);
+    }
+    else
+    {
+      $old_conf = is_string($conf['oauth']) ? unserialize($conf['oauth']) : $conf['oauth'];
+      
+      if (!isset($old_conf['allow_merge_accounts']))
+      {
+        $old_conf['allow_merge_accounts'] = true;
+        
+        $conf['oauth'] = serialize($old_conf);
+        conf_update_param('oauth', $conf['oauth']);
+      }
     }
     
@@ -55 +68 @@
     }
     
-    // add fields in hybridauth conf file
+    // add 'total' and 'enabled' fields in hybridauth conf file
     if (file_exists($this->file))
     {