Home Explore Help
Sign In
richard
/
sorbetcms
Watch 1
Star 0
Fork 1
Code Issues 0 Pull Requests 0 Commits 292 Releases 0 Wiki
Browse Source

Some changes :)

vbracco 15 years ago
parent
4a309e8faf
commit
9533dd1cf9
3 changed files with 6 additions and 9 deletions
Split View Show Diff Stats
  1. 1 2
      index.php
  2. 2 4
      plugins/feedreplacement.php
  3. 3 3
      themes/tumblr/index.htm

+ 1 - 2
index.php View File 

@@ -49,8 +49,6 @@ $theme = new themes;
49 49 
         }
50 50
51 51 
 		$feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php");
52 
-		$trigger->call('feed_url');
53 
-		$theme->set('rssFeed',"\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$feed_url."\"/>\n");
54 52
55 53 
         $gelato_includes = "<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
56 54 
         $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />";

@@ -75,6 +73,7 @@ $theme = new themes;
75 73 
 		}
76 74
77 75 
 		$trigger->call('gelato_includes');
76 
+		$theme->set('rssFeed',$feed_url);
78 77 
 		$theme->set('Gelato_includes',$gelato_includes);
79 78 
 		$theme->set('Title',$conf->title);
80 79 
 		$theme->set('Page_Title',$page_title);

+ 2 - 4
plugins/feedreplacement.php View File 

@@ -57,12 +57,10 @@ class feedreplacement extends plugins {
57 57 
 	}
58 58
59 59 
 	function feedreplacement_includeFeed(){
60 
-		global $conf,$gelato_includes;
60 
+		global $conf,$gelato_includes,$feed_url;
61 61 
 		$feedreplacement_url = $conf->get_option('feedreplacement_url');
62 62 
 		if($feedreplacement_url!=""){
63 
-			$feed = ($conf->urlFriendly?"/rss/":"/rss.php");
64 
-			$url = $conf->urlGelato.$feed;
65 
-			$gelato_includes = str_replace($url,$feedreplacement_url,$gelato_includes);
63 
+			$feed_url = $feedreplacement_url;
66 64 
 		}
67 65 
 	}
68 66

+ 3 - 3
themes/tumblr/index.htm View File 

@@ -7,8 +7,8 @@
7 7 
 	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/{Template_name}/style.css"/>
8 8 
 	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
9 9 
 	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>
10 
-	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
11 
-	{rssFeed}
10 
+	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
11 
+	<link rel="alternate" type="application/rss+xml" title="RSS" href="{rssFeed}" />
12 12 
     <title>{Page_Title}</title>
13 13 
     <!--[if IE]>
14 14 
         <style type="text/css">

@@ -20,7 +20,7 @@
20 20 
 </head>
21 21 
 <body>
22 22 
     <div id="container">
23 
-        <a href="{URL_Tumble}/rss.php"><img src="{URL_Tumble}/themes/{Template_name}/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a>
23 
+        <a href="{rssFeed}"><img src="{URL_Tumble}/themes/{Template_name}/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a>
24 24
25 25 
         <h1><a href="{URL_Tumble}/">{Title}</a></h1>
26 26