[wp-cvs] wordpress/wp-includes template-functions-general.php, 1.35, 1.36

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16124/wp-includes

Modified Files:
	template-functions-general.php 
Log Message:
Missing $before from Josh Kaufman-Horner and some code cleanup.

Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** template-functions-general.php	18 Jun 2004 00:22:09 -0000	1.35
--- template-functions-general.php	6 Jul 2004 17:04:07 -0000	1.36
***************
*** 142,167 ****
  
  function single_month_title($prefix = '', $display = true ) {
!     global $m, $month;
!     if(!empty($m)) {
!         $my_year = substr($m,0,4);
!         $my_month = $month[substr($m,4,2)];
!         if ($display)
!             echo $prefix.$my_month.$prefix.$my_year;
!         else
!             return $m;
!     }
  }
  
  /* link navigation hack by Orien http://icecode.com/ */
! function get_archives_link($url, $text, $format = "html", $before = "", $after = "") {
!     if ('link' == $format) {
!         return "\t".'<link rel="archives" title="'.$text.'" href="'.$url.'" />'."\n";
!     } else if ('option' == $format) {
!         return '<option value="'.$url.'">'.$text.'</option>'."\n";
!     } else if ('html' == $format) {
!         return "\t".'<li><a href="'.$url.'" title="'.$text.'">'.$text.'</a>'.$after.'</li>'."\n";
!     } else { // custom
!         return "\t".$before.'<a href="'.$url.'" title="'.$text.'">'.$text.'</a>'.$after."\n";
!     }
  }
  
--- 142,168 ----
  
  function single_month_title($prefix = '', $display = true ) {
! 	global $m, $month;
! 	if(!empty($m)) {
! 		$my_year = substr($m, 0, 4);
! 		$my_month = $month[substr($m, 4, 2)];
! 		if ($display)
! 			echo $prefix . $my_month . $prefix . $my_year;
! 		else
! 			return $m;
! 	}
  }
  
  /* link navigation hack by Orien http://icecode.com/ */
! function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
! 	$text = wptexturize($text);
! 	if ('link' == $format) {
! 		return "\t<link rel='archives' title='$text' href='$url' />\n";
! 	} elseif ('option' == $format) {
! 		return "\t<option value='$url'>$text</option>\n";
! 	} elseif ('html' == $format) {
! 		return "\t<li>$before<a href='$url' title='$text'>$text</a>$after</li>\n";
! 	} else { // custom
! 		return "\t$before<a href='$url' title='$text'>$text</a>$after\n";
! 	}
  }