Changeset 19

Show
Ignore:
Timestamp:
11/09/06 01:24:32 (2 years ago)
Author:
sven
Message:

fix checkin of conflicted file

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • friendicon/mod/friendicon/user_info.php

    r15 r19  
    11<?php 
    22 
    3 <<<<<<< .mine 
    43global $profile_id, $page_owner; 
    5 ======= 
    6 global $page_owner; 
    7 >>>>>>> .r14 
    84global $CFG, $USER; 
    95 
    …… 
    3935        <td> 
    4036        <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 ======= 
    4637            <img src="{$CFG->wwwroot}_icon/user/{$info->icon}/h/50/w/50" alt="{$username}" /> 
    4738        </a><br /> 
    48 >>>>>>> .r14 
    4939        <a href="{$CFG->wwwroot}{$info->username}/">{$username}</a> 
    5040        </td> 
    …… 
    5646 
    5747    $body .= "\t</tr>\n</table>\n"; 
    58 <<<<<<< .mine 
    59     $body .= "</span>"; 
    60      
    6148    if ($page_owner != $_SESSION['userid']) { 
    6249        $body .= "<a href=\"".url."_friends/?owner=$profile_id\">[" . __gettext("View all Friends") . "]</a>"; 
    …… 
    6451        $body .= "<a href=\"".url.$_SESSION['username']."/friends/\">[" . __gettext("View all Friends") . "]</a>"; 
    6552    } 
    66 ======= 
    67     $body .= "<a href=\"".url."_friends/?owner=$page_owner\">[" . __gettext("View all Friends") . "]</a>"; 
    68 >>>>>>> .r14 
    6953 
    7054    $run_result .= templates_draw(array(