[geeklog-cvs] Geeklog-1.x/public_html article.php, 1.98, 1.99 lib-common.php, 1.714, 1.715

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv48852/public_html

Modified Files:
	article.php lib-common.php 
Log Message:
Renamed the syndication feed type "geeklog" to "article" since that's what they are nowadays


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.714
retrieving revision 1.715
diff -C2 -d -r1.714 -r1.715
*** lib-common.php	21 Jul 2008 20:15:41 -0000	1.714
--- lib-common.php	27 Jul 2008 09:11:29 -0000	1.715
***************
*** 1858,1865 ****
      if( $_CONF['backend'] > 0 )
      {
!         if( !empty( $updated_type ) && ( $updated_type != 'geeklog' ))
          {
              // when a plugin's feed is to be updated, skip Geeklog's own feeds
!             $sql = "SELECT fid,type,topic,limits,update_info FROM {$_TABLES['syndication']} WHERE (is_enabled = 1) AND (type <> 'geeklog')";
          }
          else
--- 1858,1865 ----
      if( $_CONF['backend'] > 0 )
      {
!         if( !empty( $updated_type ) && ( $updated_type != 'article' ))
          {
              // when a plugin's feed is to be updated, skip Geeklog's own feeds
!             $sql = "SELECT fid,type,topic,limits,update_info FROM {$_TABLES['syndication']} WHERE (is_enabled = 1) AND (type <> 'article')";
          }
          else
***************
*** 1874,1878 ****
  
              $is_current = true;
!             if( $A['type'] == 'geeklog' )
              {
                  $is_current = SYND_feedUpdateCheck( $A['topic'],
--- 1874,1878 ----
  
              $is_current = true;
!             if( $A['type'] == 'article' )
              {
                  $is_current = SYND_feedUpdateCheck( $A['topic'],

Index: article.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** article.php	26 Jul 2008 16:25:16 -0000	1.98
--- article.php	27 Jul 2008 09:11:29 -0000	1.99
***************
*** 293,297 ****
          if ($_CONF['backend'] == 1) {
              $tid = $story->displayElements('tid');
!             $result = DB_query("SELECT filename, title, format FROM {$_TABLES['syndication']} WHERE type = 'geeklog' AND topic = '$tid' AND is_enabled = 1");
              $feeds = DB_numRows($result);
              for ($i = 0; $i < $feeds; $i++) {
--- 293,297 ----
          if ($_CONF['backend'] == 1) {
              $tid = $story->displayElements('tid');
!             $result = DB_query("SELECT filename, title, format FROM {$_TABLES['syndication']} WHERE type = 'article' AND topic = '$tid' AND is_enabled = 1");
              $feeds = DB_numRows($result);
              for ($i = 0; $i < $feeds; $i++) {