1.1 --- a/public_html/lib-common.php	Sun Sep 20 19:11:47 2009 +0200
     1.2 +++ b/public_html/lib-common.php	Sun Nov 01 09:43:28 2009 +0100
     1.3 @@ -1952,12 +1952,20 @@
     1.4  
     1.5      $curdate = date( "Y-m-d H:i:s", time() );
     1.6  
     1.7 -    if( DB_getItem( $_TABLES['stories'], 'COUNT(*)', "featured = 1 AND draft_flag = 0 AND date <= '$curdate'" ) > 1 )
     1.8 -    {
     1.9 -        // OK, we have two featured stories, fix that
    1.10 -
    1.11 -        $sid = DB_getItem( $_TABLES['stories'], 'sid', "featured = 1 AND draft_flag = 0 ORDER BY date LIMIT 1" );
    1.12 -        DB_query( "UPDATE {$_TABLES['stories']} SET featured = 0 WHERE sid = '$sid'" );
    1.13 +    // Loop through each topic
    1.14 +    $sql = "SELECT tid FROM {$_TABLES['topics']}";
    1.15 +    $result = DB_query( $sql );
    1.16 +    $num = DB_numRows( $result );
    1.17 +    for( $i = 0; $i < $num; $i++)
    1.18 +    {
    1.19 +        $A = DB_fetchArray( $result );
    1.20 +
    1.21 +        if( DB_getItem( $_TABLES['stories'], 'COUNT(*)', "featured = 1 AND draft_flag = 0 AND tid = '{$A['tid']}' AND date <= '$curdate'" ) > 1 )
    1.22 +        {
    1.23 +            // OK, we have two featured stories in a topic, fix that
    1.24 +            $sid = DB_getItem( $_TABLES['stories'], 'sid', "featured = 1 AND draft_flag = 0 ORDER BY date LIMIT 1" );
    1.25 +            DB_query( "UPDATE {$_TABLES['stories']} SET featured = 0 WHERE sid = '$sid'" );
    1.26 +        }
    1.27      }
    1.28  }
    1.29  
    1.30 @@ -2116,7 +2124,7 @@
    1.31          $op = 'AND';
    1.32      }
    1.33  
    1.34 -    $sql = "SELECT tid,topic,imageurl FROM {$_TABLES['topics']}" . $langsql;
    1.35 +    $sql = "SELECT tid,topic,imageurl,meta_description FROM {$_TABLES['topics']}" . $langsql;
    1.36      if( !COM_isAnonUser() )
    1.37      {
    1.38          $tids = DB_getItem( $_TABLES['userindex'], 'tids',
    1.39 @@ -2266,6 +2274,17 @@
    1.40          }
    1.41          $sections->set_var( 'topic_image', $topicimage );
    1.42  
    1.43 +        $desc = trim($A['meta_description']);
    1.44 +        $sections->set_var('topic_description', $desc);
    1.45 +        $desc_escaped = htmlspecialchars($desc);
    1.46 +        $sections->set_var('topic_description_escaped', $desc_escaped);
    1.47 +        if (! empty($desc)) {
    1.48 +            $sections->set_var('topic_title_attribute',
    1.49 +                               'title="' . $desc_escaped . '"');
    1.50 +        } else {
    1.51 +            $sections->set_var('topic_title_attribute', '');
    1.52 +        }
    1.53 +
    1.54          if(( $A['tid'] == $topic ) && ( $page == 1 ))
    1.55          {
    1.56              $retval .= $sections->parse( 'item', 'inactive' );