phpBB.de

Code: Alles auswählen

<<<<<<< Anfang des Konflikts — Inhalt der originalen Datei vor Aktualisierung
	// Profile url - only show if not anonymous and permission to view profile if registered user
	// For anonymous the link leads to a login page.
	if ($user_id && $user_id != ANONYMOUS && ($user->data['user_id'] == ANONYMOUS || $auth->acl_get('u_viewprofile')))
	{
		// www.phpBB-SEO.com SEO TOOLKIT BEGIN
		/*if (empty($_base_profile_url))
		{
			$_base_profile_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u={USER_ID}');
		}
		$profile_url = ($custom_profile_url !== false) ? $custom_profile_url . '&u=' . (int) $user_id : str_replace('={USER_ID}', '=' . (int) $user_id, $_base_profile_url);*/
		global $phpbb_seo;
		$phpbb_seo->set_user_url( strip_tags($username), $user_id );
		$profile_url = ($custom_profile_url !== false) ? $custom_profile_url . '&u=' . (int) $user_id : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . (int) $user_id);
		// www.phpBB-SEO.com SEO TOOLKIT END
		$tpl = (!$username_colour) ? '<a href="{PROFILE_URL}">{USERNAME}</a>' : '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
		$_profile_cache[$cache_key]['full'] = str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl);
	}
	else
	{
		$tpl = (!$username_colour) ? '{USERNAME}' : '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
		$_profile_cache[$cache_key]['full'] = str_replace(array('{USERNAME_COLOUR}', '{USERNAME}'), array($username_colour, $username), $tpl);
		$profile_url = '';
	}
======= Inhalt der neuen / aktualisierten Datei
			// Return colour
			if ($mode == 'colour')
			{
				return $username_colour;
			}

		// no break;
>>>>>>> Ende des Konflikts