Changeset 15
- Timestamp:
- 11/06/06 22:01:42 (2 years ago)
- Files:
-
- friendicon/mod/friendicon/user_info.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
friendicon/mod/friendicon/user_info.php
r14 r15 1 1 <?php 2 2 3 <<<<<<< .mine 4 global $profile_id, $page_owner; 5 ======= 3 6 global $page_owner; 7 >>>>>>> .r14 4 8 global $CFG, $USER; 5 9 … … 35 39 <td> 36 40 <a href="{$CFG->wwwroot}{$info->username}/"> 41 <<<<<<< .mine 42 <img src="{$CFG->wwwroot}{$info->username}/icons/{$info->icon}/h/50/w/50"/ alt="{$username}"> 43 </a> 44 <br/> 45 ======= 37 46 <img src="{$CFG->wwwroot}_icon/user/{$info->icon}/h/50/w/50" alt="{$username}" /> 38 47 </a><br /> 48 >>>>>>> .r14 39 49 <a href="{$CFG->wwwroot}{$info->username}/">{$username}</a> 40 50 </td> … … 46 56 47 57 $body .= "\t</tr>\n</table>\n"; 58 <<<<<<< .mine 59 $body .= "</span>"; 60 61 if ($page_owner != $_SESSION['userid']) { 62 $body .= "<a href=\"".url."_friends/?owner=$profile_id\">[" . __gettext("View all Friends") . "]</a>"; 63 } else { 64 $body .= "<a href=\"".url.$_SESSION['username']."/friends/\">[" . __gettext("View all Friends") . "]</a>"; 65 } 66 ======= 48 67 $body .= "<a href=\"".url."_friends/?owner=$page_owner\">[" . __gettext("View all Friends") . "]</a>"; 68 >>>>>>> .r14 49 69 50 70 $run_result .= templates_draw(array(
