Commit 9552519e authored by Frédéric G. Marand's avatar Frédéric G. Marand
Browse files

RIFF-1: fixed G2 wotd meta alternate replacing the default site feed.

parent 3123c1b5

g2.module

+6 −2
Original line number Diff line number Diff line
@@ -1333,7 +1333,8 @@ function g2_block($op = 'list', $delta = 0, $edit = array()) { 


      case G2DELTAWOTD:

        $block['subject'] = variable_get(G2VARWOTDTITLE, G2DEFWOTDTITLE);

        $block['content'] = theme('g2_wotd', _g2_wotd(variable_get(G2VARWOTDBODYSIZE, G2DEFWOTDBODYSIZE)));

        $wotd = _g2_wotd(variable_get(G2VARWOTDBODYSIZE, G2DEFWOTDBODYSIZE));

        $block['content'] = theme('g2_wotd', $wotd);

        break;



      case G2DELTALATEST:
@@ -2332,7 +2333,10 @@ function theme_g2_wotd($node = NULL) { 
  }

  $node->taxonomy = _g2_comb_taxonomy($node->taxonomy);

  $ret .= _g2_entry_terms($node); // No need to test: it won't change anything if a taxonomy has not been returned

  $ret .= theme('more_link', url('node/' . $node->nid), t(' (+)'));

  $feedUrl = url('node/' . $node->nid);

  $feedTitle = t(' (+)');

  $ret .= theme('more_link', $feedUrl, $feedTitle);

  $feedLinks = drupal_add_feed($feedUrl, $feedTitle);

  if (variable_get(G2VARWOTDFEEDLINK, G2DEFWOTDFEEDLINK)) {

    $ret .= theme('feed_icon', url(G2PATHWOTDFEED, array('absolute' => TRUE)),

      t('A word a day in your RSS reader'));