[cc-commits] [CC SVN] r14770 - in ccwordpress/branches/production: . www/wp-content/themes/cc5

webmaster at creativecommons.org webmaster at creativecommons.org
Thu Nov 18 15:14:41 EST 2010


Author: bse
Date: 2010-11-18 20:14:41 +0000 (Thu, 18 Nov 2010)
New Revision: 14770

Modified:
   ccwordpress/branches/production/
   ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php
   ccwordpress/branches/production/www/wp-content/themes/cc5/category.php
   ccwordpress/branches/production/www/wp-content/themes/cc5/functions.php
   ccwordpress/branches/production/www/wp-content/themes/cc5/header.php
   ccwordpress/branches/production/www/wp-content/themes/cc5/tag.php
Log:
Merged revisions 14769 via svnmerge from 
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk

........
  r14769 | bse | 2010-11-18 20:13:31 +0000 (Thu, 18 Nov 2010) | 1 line
  
  Fixed all RSS feed links. [issue 559]
........



Property changes on: ccwordpress/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
   - /ccwordpress/trunk:1-8296,8298-9115,9117-9643,9645-9659,9661-9687,9689-9733,9736-9759,9761-9839,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10638,10640-10734,10736,10740-11077,11079-11279,11281-11284,11286-11366,11368-11649,11651-11940,11943,11945-12534,12536-12603,12605-12657,12659-12848,12850-12854,12856-12885,12888-13043,13045-13091,13093-13373,13375-13382,13384-13518,13520-13566,13568-13613,13615-13658,13660-13663,13667-13686,13688-13728,13733,13735-13736,13738-13809,13811-14096,14098-14106,14109-14212,14214-14431,14433-14442,14444-14550,14558-14559,14562,14565,14571-14572,14590,14608,14611,14615,14617,14619,14621,14623,14652,14654,14660,14662,14666,14668,14671,14673,14676-14686,14688,14690,14692,14694,14696,14698,14700,14702-14703,14706,14708,14710,14712,14714,14716-14718,14721,14726,14728,14730,14734-14735,14737-14738,14740,14742,14744,14746,14748,14750,14752,14754,14756-14757,14764-14765
   + /ccwordpress/trunk:1-8296,8298-9115,9117-9643,9645-9659,9661-9687,9689-9733,9736-9759,9761-9839,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10638,10640-10734,10736,10740-11077,11079-11279,11281-11284,11286-11366,11368-11649,11651-11940,11943,11945-12534,12536-12603,12605-12657,12659-12848,12850-12854,12856-12885,12888-13043,13045-13091,13093-13373,13375-13382,13384-13518,13520-13566,13568-13613,13615-13658,13660-13663,13667-13686,13688-13728,13733,13735-13736,13738-13809,13811-14096,14098-14106,14109-14212,14214-14431,14433-14442,14444-14550,14558-14559,14562,14565,14571-14572,14590,14608,14611,14615,14617,14619,14621,14623,14652,14654,14660,14662,14666,14668,14671,14673,14676-14686,14688,14690,14692,14694,14696,14698,14700,14702-14703,14706,14708,14710,14712,14714,14716-14718,14721,14726,14728,14730,14734-14735,14737-14738,14740,14742,14744,14746,14748,14750,14752,14754,14756-14757,14764-14765,14769

Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php	2010-11-18 20:13:31 UTC (rev 14769)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php	2010-11-18 20:14:41 UTC (rev 14770)
@@ -51,7 +51,7 @@
             </div>
             
             <div id="archives">
-			<strong><a href="/<?php echo $category->slug; ?>/rss">Subscribe to RSS</a></strong><br/><br/>
+			  <strong><a href="/category/<?php echo $category->slug; ?>/feed/rss">Subscribe to RSS</a></strong><br/><br/>
 			  <h4>Archives</h4> 
               <ul class="archives">
                 <?php cc_get_cat_archives($cat, 'monthly', '', 'html', '', '', TRUE); ?>

Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/category.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/category.php	2010-11-18 20:13:31 UTC (rev 14769)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/category.php	2010-11-18 20:14:41 UTC (rev 14770)
@@ -64,7 +64,7 @@
 
             <div id="archives">
 
-			<strong><a href="/<?php echo $category->slug; ?>/rss">Subscribe to RSS</a></strong><br/><br/>
+			<strong><a href="<?php echo get_category_link($category_id); ?>/feed/rss">Subscribe to RSS</a></strong><br/><br/>
 <!--			  <h4>Archives</h4> 
               <ul class="archives">
                 <?php cc_get_cat_archives($cat, 'monthly', '', 'html', '', '', TRUE); ?>

Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/functions.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/functions.php	2010-11-18 20:13:31 UTC (rev 14769)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/functions.php	2010-11-18 20:14:41 UTC (rev 14770)
@@ -2,6 +2,7 @@
 // Remove link rel="start" from blog pages
 remove_action( 'wp_head', 'start_post_rel_link'); // Removes the start link
 
+remove_action( 'wp_head', 'feed_links_extra', 3); // remove default feed links
 
 
 if (function_exists('register_sidebar')) {

Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/header.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/header.php	2010-11-18 20:13:31 UTC (rev 14769)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/header.php	2010-11-18 20:14:41 UTC (rev 14770)
@@ -44,7 +44,9 @@
   <?php if (is_home() || ($category_name == "weblog")) { ?>
   <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('home')?>/weblog/rss" />
   <?php } else if (is_category()) { ?>
-  <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php echo get_settings('home') . "/category/" . $category_name; ?>/feed/rss" />
+  <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php echo get_category_link($category_id); ?>/feed/rss" />
+  <?php } else if (is_tag()) { ?>
+  <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php echo get_tag_link($tag_id); ?>/feed/rss" />
   <?php } ?>
   	
 	<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />
@@ -74,7 +76,7 @@
         <h1><a href="<?php echo get_option('home'); ?>"><span>Creative Commons</span></a></h1>
       </div>
       <?php require_once "nav.php"; ?>
-      
+<?php echo $tag_link; ?>    
       <!-- <div id="headerSearch">
         <form method="get" id="searchform" action="http://creativecommons.org/">
           <input type="text" name="s" id="s" size="30" class="inactive" />

Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/tag.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/tag.php	2010-11-18 20:13:31 UTC (rev 14769)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/tag.php	2010-11-18 20:14:41 UTC (rev 14770)
@@ -44,7 +44,7 @@
 
             <div id="archives">
 
-			<strong><a href="<?php echo get_tag_link($tag_id) . '/rss';?>">Subscribe to RSS</a></strong><br/><br/>
+			<strong><a href="<?php echo get_tag_link($tag_id) . '/feed/rss';?>">Subscribe to RSS</a></strong><br/><br/>
 <!--			  <h4>Archives</h4> 
               <ul class="archives">
                 <?php cc_get_cat_archives($cat, 'monthly', '', 'html', '', '', TRUE); ?>




More information about the cc-commits mailing list