From 102f0f566b930f9c5030df47f198f0e1627ce317 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 25 Nov 2008 15:54:45 +0000 Subject: Normalize atom url generation --- modules/atom/libraries/Gallery_Atom_Entry.php | 4 ++-- modules/atom/libraries/Gallery_Atom_Feed.php | 4 ++-- modules/atom/libraries/Gallery_Atom_Link.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/atom/libraries') diff --git a/modules/atom/libraries/Gallery_Atom_Entry.php b/modules/atom/libraries/Gallery_Atom_Entry.php index 57785fd7..e7d0ea8b 100644 --- a/modules/atom/libraries/Gallery_Atom_Entry.php +++ b/modules/atom/libraries/Gallery_Atom_Entry.php @@ -27,10 +27,10 @@ class Gallery_Atom_Entry_Core extends Atom_Entry { parent::__construct("entry"); /* Set feed ID and self link. */ - $this->id(html::specialchars(atom::get_absolute_url())); + $this->id(html::specialchars(url::get_absolute_url())); $this->link() ->rel("self") - ->href(atom::get_absolute_url()); + ->href(url::get_absolute_url()); } public function link() { diff --git a/modules/atom/libraries/Gallery_Atom_Feed.php b/modules/atom/libraries/Gallery_Atom_Feed.php index ff908682..61fba5b4 100644 --- a/modules/atom/libraries/Gallery_Atom_Feed.php +++ b/modules/atom/libraries/Gallery_Atom_Feed.php @@ -27,10 +27,10 @@ class Gallery_Atom_Feed_Core extends Atom_Feed { parent::__construct("feed"); /* Set feed ID and self link. */ - $this->id(html::specialchars(atom::get_absolute_url())); + $this->id(html::specialchars(url::get_absolute_url())); $this->link() ->rel("self") - ->href(atom::get_absolute_url()); + ->href(url::get_absolute_url()); } public function link() { diff --git a/modules/atom/libraries/Gallery_Atom_Link.php b/modules/atom/libraries/Gallery_Atom_Link.php index abcd3bc9..07e3e891 100644 --- a/modules/atom/libraries/Gallery_Atom_Link.php +++ b/modules/atom/libraries/Gallery_Atom_Link.php @@ -27,7 +27,7 @@ class Gallery_Atom_Link_Core extends Atom_Link { $this->rel("related") ->type(rest::ATOM) ->title($title) - ->href(sprintf("%s%s", atom::get_base_url(), $relative_uri)); + ->href(sprintf("%s%s", url::base(true, "http"), $relative_uri)); return $this; } @@ -39,7 +39,7 @@ class Gallery_Atom_Link_Core extends Atom_Link { $this->rel("related") ->type("image/" . $image_type) ->title($title) - ->href(sprintf("%s%s", atom::get_base_url(), $relative_uri)); + ->href(sprintf("%s%s", url::base(true, "http"), $relative_uri)); return $this; } } -- cgit v1.2.3