Navigation

Changeset 205 for index.php

Timestamp:

07/02/07 22:19:45 (2 years ago)

Author:

dez

Message:

Resolves conflict in blog.lib.php
Applies updates made to the live copy that weren't in SVN

Files:

r184	r205
3	3	include("blog.lib.php");
4	4	//make our command list
5		$request=explode('/',substr($_SERVER[~~PATH_INFO~~], 1));
	5	$request=explode('/',substr($_SERVER['PATH_INFO'], 1));
6	6	//if we have something which might be a username start a blogs instance
7	7	if($request[0] != "" and $request[0] != "list"){
…	…
24	24	//check we have a valid username before offering a RSS feed
25	25	if($blog->userName) {
26		$rss_url = "http://{$_SERVER['HTTP_HOST']}{$blog->httpPath}feed~~.php~~/rss/{$blog->userName}".(($request[0]=="category")?"/category/".(int)$request[1]:"");
27		$atom_url = "http://{$_SERVER['HTTP_HOST']}{$blog->httpPath}feed~~.php~~/atom/{$blog->userName}".(($request[0]=="category")?"/category/".(int)$request[1]:"");
	26	$rss_url = "http://{$_SERVER['HTTP_HOST']}{$blog->httpPath}feed/rss/{$blog->userName}".(($request[0]=="category")?"/category/".(int)$request[1]:"");
	27	$atom_url = "http://{$_SERVER['HTTP_HOST']}{$blog->httpPath}feed/atom/{$blog->userName}".(($request[0]=="category")?"/category/".(int)$request[1]:"");
28	28	echo " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"{$blog->title}\" href=\"$rss_url\"/>\n";
29	29	echo " <link rel=\"alternate\" type=\"application/atom+xml\" title=\"{$blog->title}\" href=\"$atom_url\"/>\n";