Changeset 12814

Timestamp:

Sep 4, 2009, 12:33:34 AM (13 years ago)

Author:

urabe

Message:

#3878 Timing in which the birthday banner is displayed is changed.

Location:

OpenPNE3/trunk

Files:

• apps/pc_frontend/modules/member/templates/profileSuccess.php (modified) (2 diffs)
• lib/action/sfOpenPNEMemberAction.class.php (modified) (1 diff)

OpenPNE3/trunk/apps/pc_frontend/modules/member/templates/profileSuccess.php

@@ -52 +52 @@
 <?php $content = ob_get_clean() ?>
 <?php op_include_parts('descriptionBox', 'informationAboutThisIsYourProfilePage', array('body' => $content)) ?>
-<?php elseif (!$relation->isFriend() && opConfig::get('enable_friend_link')): ?>
+<?php else: ?>
 <?php include_partial('member/birthdayBox', array('targetDay' => $targetDay)); ?>
+<?php if (!$relation->isFriend() && opConfig::get('enable_friend_link')): ?>
 <?php ob_start() ?>
 <p><?php echo __('If %1% is your friend, let us add to friends it!', array('%1%' => $member->getName())) ?><br />
@@ -60 +61 @@
 <?php $content = ob_get_clean() ?>
 <?php op_include_parts('descriptionBox', 'informationAboutThisIsYourProfilePage', array('body' => $content)) ?>
+<?php endif; ?>
 <?php endif; ?>
 <?php if (isset($topGadgets)): ?>

OpenPNE3/trunk/lib/action/sfOpenPNEMemberAction.class.php

@@ -166 +166 @@
     $this->crownIds = Doctrine::getTable('CommunityMember')->getCommunityIdsOfAdminByMemberId($id);
 
-    $birthday = Doctrine::getTable('MemberProfile')->retrieveByMemberIdAndProfileName($id, 'birthday');
+    $birthday = Doctrine::getTable('MemberProfile')->retrieveByMemberIdAndProfileName($id, 'op_preset_birthday');
     $this->targetDay = opToolkit::extractTargetDay((string)$birthday);