Changeset 10971

Timestamp:

Mar 10, 2009, 11:47:33 AM (13 years ago)

Author:

ShogoKawahara

Message:

fixed Member::getEmailAddress() and Member::getEmailAddresses()

File:

• OpenPNE3/trunk/lib/model/Member.php (modified) (2 diffs)

OpenPNE3/trunk/lib/model/Member.php

@@ -186 +186 @@
     }
 
-    $memberPcAddressConfig = MemberConfigPeer::retrieveByNameAndMemberId('pc_address', $this->getId());
-    $memberMobileAddressConfig = MemberConfigPeer::retrieveByNameAndMemberId('mobile_address', $this->getId());
-
-    if ($memberMobileAddressConfig && ($isPriorityMobile || !$memberPcAddressConfig))
-    {
-      return $memberMobileAddressConfig->getValue();
-    }
-
-    if ($memberPcAddressConfig)
-    {
-      return $memberPcAddressConfig->getValue();
+    $memberPcAddress     = $this->getConfig('pc_address');
+    $memberMobileAddress = $this->getConfig('mobile_address');
+
+    if ($memberMobileAddress && ($isPriorityMobile || !$memberPcAddress))
+    {
+      return $memberMobileAddress;
+    }
+
+    if ($memberPcAddress)
+    {
+      return $memberPcAddress;
     }
 
@@ -205 +205 @@
   {
     $result = array();
-    $memberPcAddressConfig = MemberConfigPeer::retrieveByNameAndMemberId('pc_address', $this->getId());
-    $memberMobileAddressConfig = MemberConfigPeer::retrieveByNameAndMemberId('mobile_address', $this->getId());
-
-    if ($memberPcAddressConfig)
-    {
-      $result[] = $memberPcAddressConfig->getValue();
-    }
-
-    if ($memberMobileAddressConfig)
-    {
-      $result[] = $memberMobileAddressConfig->getValue();
+
+    $memberPcAddress     = $this->getConfig('pc_address');
+    $memberMobileAddress = $this->getConfig('mobile_address');
+
+    if ($memberPcAddress)
+    {
+      $result[] = $memberPcAddress;
+    }
+
+    if ($memberMobileAddress)
+    {
+      $result[] = $memberMobileAddress;
     }