diff -crB geeklog_fresh/language/english_utf-8.php geeklog/language/english_utf-8.php
*** geeklog_fresh/language/english_utf-8.php	Thu Jan 22 20:19:54 2009
--- geeklog/language/english_utf-8.php	Sat Apr 11 15:32:54 2009
***************
*** 732,738 ****
      23 => 'To modify or delete a story, click on that story\'s edit icon below. To view a story, click on the title of the story you wish to view. To create a new story, click on "Create New" above.',
      24 => 'The ID you chose for this story is already in use. Please use another ID.',
      25 => 'Error when saving story',
!     26 => 'Story Preview',
      27 => '<p>If you use [unscaledX] instead of [imageX], the image will be inserted at its original dimensions.</p>',
      28 => '<p><b>PREVIEWING</b>: Previewing a story with images attached is best done by saving the article as a draft INSTEAD OF hitting the preview button.  Use the preview button only when images are not attached.</p>',
      29 => 'Trackbacks',
--- 732,738 ----
      23 => 'To modify or delete a story, click on that story\'s edit icon below. To view a story, click on the title of the story you wish to view. To create a new story, click on "Create New" above.',
      24 => 'The ID you chose for this story is already in use. Please use another ID.',
      25 => 'Error when saving story',
!     26 => 'Full Story Preview',
      27 => '<p>If you use [unscaledX] instead of [imageX], the image will be inserted at its original dimensions.</p>',
      28 => '<p><b>PREVIEWING</b>: Previewing a story with images attached is best done by saving the article as a draft INSTEAD OF hitting the preview button.  Use the preview button only when images are not attached.</p>',
      29 => 'Trackbacks',
***************
*** 794,800 ****
      85 => 'Show All',
      86 => 'Advanced Editor',
      87 => 'Story Stats',
!     88 => 'Wiki-style format'
  );
  
  
--- 794,802 ----
      85 => 'Show All',
      86 => 'Advanced Editor',
      87 => 'Story Stats',
!     88 => 'Wiki-style format',
!     89 => 'Show Intro Text in Full View',
!     90 => 'Compact Story Preview'
  );
  
  
***************
*** 1715,1720 ****
--- 1717,1723 ----
      'page_break_comments' => "Comments on Multi-Page Articles",
      'article_image_align' => 'Topic Icon Alignment',
      'show_topic_icon' => "Show Topic Icon?",
+     'show_intro_fullview' => "Show Intro Text in Full View",
      'draft_flag' => "Draft Flag Default",
      'frontpage' => "Frontpage Default",
      'hide_no_news_msg' => 'Hide "No News" Message?',
diff -crB geeklog_fresh/public_html/admin/install/config-install.php geeklog/public_html/admin/install/config-install.php
*** geeklog_fresh/public_html/admin/install/config-install.php	Sat Feb  7 18:44:40 2009
--- geeklog/public_html/admin/install/config-install.php	Sat Apr 11 16:28:19 2009
***************
*** 102,107 ****
--- 102,108 ----
      $c->add('page_break_comments','last','select',1,7,7,1250,TRUE);
      $c->add('article_image_align','right','select',1,7,8,1260,TRUE);
      $c->add('show_topic_icon',1,'select',1,7,0,1270,TRUE);
+     $c->add('show_intro_fullview',1,'select',1,7,0,1275,TRUE);
      $c->add('draft_flag',0,'select',1,7,0,1280,TRUE);
      $c->add('frontpage',1,'select',1,7,0,1290,TRUE);
      $c->add('hide_no_news_msg',0,'select',1,7,0,1300,TRUE);
diff -crB geeklog_fresh/public_html/admin/story.php geeklog/public_html/admin/story.php
*** geeklog_fresh/public_html/admin/story.php	Sat Feb  7 16:00:56 2009
--- geeklog/public_html/admin/story.php	Sat Apr 11 17:52:20 2009
***************
*** 343,362 ****
      $story_templates->set_var ('hour_mode',      $_CONF['hour_mode']);
  
      if ($story->hasContent()) {
!         $previewContent = STORY_renderArticle($story, 'p');
!         if ($advanced_editormode AND $previewContent != '' ) {
!             $story_templates->set_var('preview_content', $previewContent);
!         } elseif ($previewContent != '') {
!             $display .= COM_startBlock ($LANG24[26], '',
!                             COM_getBlockTemplate ('_admin_block', 'header'));
!             $display .= $previewContent;
!             $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
          }
      }
  
      if ($advanced_editormode) {
          $navbar = new navbar;
!         if (!empty ($previewContent)) {
              $navbar->add_menuitem($LANG24[79],'showhideEditorDiv("preview",0);return false;',true);
              $navbar->add_menuitem($LANG24[80],'showhideEditorDiv("editor",1);return false;',true);
              $navbar->add_menuitem($LANG24[81],'showhideEditorDiv("publish",2);return false;',true);
--- 343,371 ----
      $story_templates->set_var ('hour_mode',      $_CONF['hour_mode']);
  
      if ($story->hasContent()) {
!         $previewContentCompact= STORY_renderArticle( $story );
!         $previewContentFull= STORY_renderArticle( $story, 'p' );
!         if ($advanced_editormode ) {
!             $story_templates->set_var( 'lang_compact_story_preview', $LANG24[ 90 ] );
!             $story_templates->set_var( 'lang_full_story_preview', $LANG24[ 26 ] );
!             $story_templates->set_var( 'preview_content_compact', $previewContentCompact );
!             $story_templates->set_var( 'preview_content_full', $previewContentFull );
!         } else {
!             // add the compact preview block
!             $display.= COM_startBlock( $LANG24[ 90 ], '', COM_getBlockTemplate( '_admin_block', 'header' ) );
!             $display.= $previewContentCompact;
!             $display.= COM_endBlock( COM_getBlockTemplate( '_admin_block', 'footer' ) );
!             
!             // add the full preview block
!             $display.= COM_startBlock( $LANG24[ 26 ], '', COM_getBlockTemplate ( '_admin_block', 'header' ) );
!             $display.= $previewContentFull;
!             $display.= COM_endBlock( COM_getBlockTemplate( '_admin_block', 'footer' ) );
          }
      }
  
      if ($advanced_editormode) {
          $navbar = new navbar;
!         if (!empty ($previewContentCompact) || !empty( $previewContentFull )) {
              $navbar->add_menuitem($LANG24[79],'showhideEditorDiv("preview",0);return false;',true);
              $navbar->add_menuitem($LANG24[80],'showhideEditorDiv("editor",1);return false;',true);
              $navbar->add_menuitem($LANG24[81],'showhideEditorDiv("publish",2);return false;',true);
***************
*** 540,545 ****
--- 549,566 ----
      } else {
          $story_templates->set_var('show_topic_icon_checked', '');
      }
+     $story_templates->set_var('lang_show_intro_fullview', $LANG24[89]);
+     if ($story->EditElements('show_intro_fullview') == 1) {
+         $story_templates->set_var('show_intro_fullview_checked', 'checked="checked"');
+     } else {
+         $story_templates->set_var('show_intro_fullview_checked', '');
+     }
+     $story_templates->set_var('lang_show_intro_rss', $LANG24[90]);
+     if ($story->EditElements('show_intro_rss') == 1) {
+         $story_templates->set_var('show_intro_rss_checked', 'checked="checked"');
+     } else {
+         $story_templates->set_var('show_intro_rss_checked', '');
+     }
      $story_templates->set_var('lang_draft', $LANG24[34]);
      if ($story->EditElements('draft_flag')) {
          $story_templates->set_var('is_checked', 'checked="checked"');
diff -crB geeklog_fresh/public_html/layout/professional/admin/story/storyeditor.thtml geeklog/public_html/layout/professional/admin/story/storyeditor.thtml
*** geeklog_fresh/public_html/layout/professional/admin/story/storyeditor.thtml	Sun Dec 14 10:57:40 2008
--- geeklog/public_html/layout/professional/admin/story/storyeditor.thtml	Sat Apr 11 14:03:53 2009
***************
*** 70,75 ****
--- 70,81 ----
                                          </td>
                                      </tr>
                                      <tr>
+                                         <td class="alignright">{lang_show_intro_fullview}:</td>
+                                         <td>
+                                             <input type="checkbox" name="show_intro_fullview" {show_intro_fullview_checked}{xhtml}>
+                                         </td>
+                                     </tr>
+                                     <tr>
                                          <td class="alignright">{lang_draft}:</td>
                                          <td><input type="checkbox" name="draft_flag" {is_checked}{xhtml}></td>
                                      </tr>
diff -crB geeklog_fresh/public_html/layout/professional/admin/story/storyeditor_advanced.thtml geeklog/public_html/layout/professional/admin/story/storyeditor_advanced.thtml
*** geeklog_fresh/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Thu Jan 22 20:19:56 2009
--- geeklog/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sat Apr 11 17:52:43 2009
***************
*** 55,62 ****
                  </td>
              </tr>
              <tr>
!                 <td class="alignright">{lang_show_topic_icon}:<input type="checkbox" name="show_topic_icon" {show_topic_icon_checked}{xhtml}> </td>
!                 <td style="padding-left:25px;">{lang_draft}:<input type="checkbox" name="draft_flag" {is_checked}{xhtml}><span style="padding-left:30px;">{lang_postmode}:</span>&nbsp;<select id="sel_editmode" name="postmode" {change_editormode}>{post_options}</select></td>
              </tr>
          </table>
          <!-- Basic textarea field - no editor -->
--- 55,68 ----
                  </td>
              </tr>
              <tr>
!                 <td class="alignright">
!                     {lang_show_topic_icon}:<input type="checkbox" name="show_topic_icon" {show_topic_icon_checked}{xhtml}>
!                 </td>
!                 <td style="padding-left:25px;">
!                     {lang_show_intro_fullview}:<input type="checkbox" name="show_intro_fullview" {show_intro_fullview_checked}{xhtml}>
!                     <span style="padding-left:25px;">{lang_draft}:</span>&nbsp;<input type="checkbox" name="draft_flag" {is_checked}{xhtml}>
!                     <span style="padding-left:30px;">{lang_postmode}:</span>&nbsp;<select id="sel_editmode" name="postmode" {change_editormode}>{post_options}</select>
!                 </td>
              </tr>
          </table>
          <!-- Basic textarea field - no editor -->
***************
*** 224,230 ****
          </div>
      </form>
      <div id="preview" style="width:99%; border:1px dashed grey;padding:5px;margin:10px;display:{show_preview};">
!         {preview_content}
      </div>
  
      <script type="text/javascript">
--- 230,243 ----
          </div>
      </form>
      <div id="preview" style="width:99%; border:1px dashed grey;padding:5px;margin:10px;display:{show_preview};">
!         <fieldset>
!             <legend>{lang_compact_story_preview}</legend>
!             {preview_content_compact}
!         </fieldset>
!         <fieldset>
!             <legend>{lang_full_story_preview}</legend>
!             {preview_content_full}
!         </fieldset>
      </div>
  
      <script type="text/javascript">
diff -crB geeklog_fresh/public_html/profiles.php geeklog/public_html/profiles.php
*** geeklog_fresh/public_html/profiles.php	Sun Jan 18 18:27:58 2009
--- geeklog/public_html/profiles.php	Sat Apr 11 21:11:02 2009
***************
*** 300,306 ****
          return $retval;
      }
  
!     $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day FROM {$_TABLES['stories']} WHERE sid = '$sid'";
      $result = DB_query ($sql);
      $A = DB_fetchArray ($result);
      $shortmsg = COM_stripslashes ($shortmsg);
--- 300,306 ----
          return $retval;
      }
  
!     $sql = "SELECT uid,title,introtext,bodytext,show_intro_fullview,commentcode,UNIX_TIMESTAMP(date) AS day FROM {$_TABLES['stories']} WHERE sid = '$sid'";
      $result = DB_query ($sql);
      $A = DB_fetchArray ($result);
      $shortmsg = COM_stripslashes ($shortmsg);
***************
*** 325,333 ****
          $author = COM_getDisplayName ($A['uid']);
          $mailtext .= $LANG01[1] . ' ' . $author . LB;
      }
!     $mailtext .= LB
!         . COM_undoSpecialChars(stripslashes(strip_tags($A['introtext']))).LB.LB
!         . COM_undoSpecialChars(stripslashes(strip_tags($A['bodytext']))).LB.LB
          . '------------------------------------------------------------'.LB;
      if ($A['commentcode'] == 0) { // comments allowed
          $mailtext .= $LANG08[24] . LB
--- 325,335 ----
          $author = COM_getDisplayName ($A['uid']);
          $mailtext .= $LANG01[1] . ' ' . $author . LB;
      }
!     $mailtext .= LB;
!     if( $A['show_intro_fullview'] == 1 ) {
!         $mailtext .= COM_undoSpecialChars(stripslashes(strip_tags($A['introtext']))).LB.LB;
!     }
!     $mailtext .= COM_undoSpecialChars(stripslashes(strip_tags($A['bodytext']))).LB.LB
          . '------------------------------------------------------------'.LB;
      if ($A['commentcode'] == 0) { // comments allowed
          $mailtext .= $LANG08[24] . LB
diff -crB geeklog_fresh/sql/mssql_tableanddata.php geeklog/sql/mssql_tableanddata.php
*** geeklog_fresh/sql/mssql_tableanddata.php	Thu Jan 22 20:19:56 2009
--- geeklog/sql/mssql_tableanddata.php	Sat Apr 11 13:57:47 2009
***************
*** 253,258 ****
--- 253,259 ----
      [related] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [featured] [tinyint] NOT NULL ,
      [show_topic_icon] [tinyint] NOT NULL ,
+     [show_intro_fullview] [tinyint] NOT NULL ,
      [commentcode] [smallint] NOT NULL ,
      [trackbackcode] [smallint] NOT NULL ,
      [statuscode] [smallint] NOT NULL ,
***************
*** 905,910 ****
--- 906,912 ----
      CONSTRAINT [DF_{$_TABLES['stories']}_trackbacks] DEFAULT (0) FOR [trackbacks],
      CONSTRAINT [DF_{$_TABLES['stories']}_featured] DEFAULT (0) FOR [featured],
      CONSTRAINT [DF_{$_TABLES['stories']}_show_topic_icon] DEFAULT (1) FOR [show_topic_icon],
+     CONSTRAINT [DF_{$_TABLES['stories']}_show_intro_fullview] DEFAULT (1) FOR [show_intro_fullview],
      CONSTRAINT [DF_{$_TABLES['stories']}_commentcode] DEFAULT (0) FOR [commentcode],
      CONSTRAINT [DF_{$_TABLES['stories']}_trackbackcode] DEFAULT (0) FOR [trackbackcode],
      CONSTRAINT [DF_{$_TABLES['stories']}_statuscode] DEFAULT (0) FOR [statuscode],
diff -crB geeklog_fresh/sql/mysql_tableanddata.php geeklog/sql/mysql_tableanddata.php
*** geeklog_fresh/sql/mysql_tableanddata.php	Thu Jan 22 20:19:56 2009
--- geeklog/sql/mysql_tableanddata.php	Sat Apr 11 13:55:56 2009
***************
*** 273,278 ****
--- 273,279 ----
    related text,
    featured tinyint(3) unsigned NOT NULL default '0',
    show_topic_icon tinyint(1) unsigned NOT NULL default '1',
+   show_intro_fullview tinyint(1) unsigned NOT NULL default '1',
    commentcode tinyint(4) NOT NULL default '0',
    trackbackcode tinyint(4) NOT NULL default '0',
    statuscode tinyint(4) NOT NULL default '0',
Only in geeklog/sql/updates: mssql_1.5.2_to_1.6.0.php
Only in geeklog/sql/updates: mysql_1.5.2_to_1.6.0.php
diff -crB geeklog_fresh/system/classes/story.class.php geeklog/system/classes/story.class.php
*** geeklog_fresh/system/classes/story.class.php	Thu Jan 22 20:19:56 2009
--- geeklog/system/classes/story.class.php	Sat Apr 11 14:02:52 2009
***************
*** 120,125 ****
--- 120,126 ----
      var $_related;
      var $_featured;
      var $_show_topic_icon;
+     var $_show_intro_fullview;
      var $_commentcode;
      var $_trackbackcode;
      var $_statuscode;
***************
*** 186,191 ****
--- 187,193 ----
             'related' => 1,
             'featured' => 1,
             'show_topic_icon' => 1,
+            'show_intro_fullview' => 1,
             'commentcode' => 1,
             'trackbackcode' => 1,
             'statuscode' => 1,
***************
*** 228,233 ****
--- 230,240 ----
                  STORY_AL_CHECKBOX,
                  '_show_topic_icon'
                ),
+            'show_intro_fullview' => array
+               (
+                 STORY_AL_CHECKBOX,
+                 '_show_intro_fullview'
+               ),
             'draft_flag' => array
                (
                  STORY_AL_CHECKBOX,
***************
*** 404,410 ****
                  . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')";
  
              $sql['mssql'] =
!                 "SELECT STRAIGHT_JOIN s.sid, s.uid, s.draft_flag, s.tid, s.date, s.title, CAST(s.introtext AS text) AS introtext, CAST(s.bodytext AS text) AS bodytext, s.hits, s.numemails, s.comments, s.trackbacks, s.related, s.featured, s.show_topic_icon, s.commentcode, s.trackbackcode, s.statuscode, s.expire, s.postmode, s.frontpage, s.in_transit, s.owner_id, s.group_id, s.perm_owner, s.perm_group, s.perm_members, s.perm_anon, s.advanced_editor_mode, " . " UNIX_TIMESTAMP(s.date) AS unixdate, UNIX_TIMESTAMP(s.expire) as expireunix, " . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')";
          } elseif (!empty($sid) && ($mode == 'editsubmission')) {
              $sql = 'SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) AS unixdate, '
                  . 'u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl, t.group_id, ' . 't.perm_owner, t.perm_group, t.perm_members, t.perm_anon ' . 'FROM ' . $_TABLES['storysubmission'] . ' AS s, ' . $_TABLES['users'] . ' AS u, ' . $_TABLES['topics'] . ' AS t WHERE (s.uid = u.uid) AND' . ' (s.tid = t.tid) AND (sid = \'' . $sid . '\')';
--- 411,417 ----
                  . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')";
  
              $sql['mssql'] =
!                 "SELECT STRAIGHT_JOIN s.sid, s.uid, s.draft_flag, s.tid, s.date, s.title, CAST(s.introtext AS text) AS introtext, CAST(s.bodytext AS text) AS bodytext, s.hits, s.numemails, s.comments, s.trackbacks, s.related, s.featured, s.show_topic_icon, s._show_intro_fullview, s.commentcode, s.trackbackcode, s.statuscode, s.expire, s.postmode, s.frontpage, s.in_transit, s.owner_id, s.group_id, s.perm_owner, s.perm_group, s.perm_members, s.perm_anon, s.advanced_editor_mode, " . " UNIX_TIMESTAMP(s.date) AS unixdate, UNIX_TIMESTAMP(s.expire) as expireunix, " . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')";
          } elseif (!empty($sid) && ($mode == 'editsubmission')) {
              $sql = 'SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) AS unixdate, '
                  . 'u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl, t.group_id, ' . 't.perm_owner, t.perm_group, t.perm_members, t.perm_anon ' . 'FROM ' . $_TABLES['storysubmission'] . ' AS s, ' . $_TABLES['users'] . ' AS u, ' . $_TABLES['topics'] . ' AS t WHERE (s.uid = u.uid) AND' . ' (s.tid = t.tid) AND (sid = \'' . $sid . '\')';
***************
*** 423,428 ****
--- 430,441 ----
              } else {
                  $this->_show_topic_icon = 1;
              }
+             
+             if (isset($_CONF['show_intro_fullview'])) {
+                 $this->_show_intro_fullview = $_CONF['show_intro_fullview'];
+             } else {
+                 $this->_show_intro_fullview = 1;
+             }
  
              $this->_uid = $_USER['uid'];
              $this->_date = time();
***************
*** 515,520 ****
--- 528,539 ----
              } else {
                  $this->_show_topic_icon = 1;
              }
+             
+             if (isset($_CONF['show_intro_fullview'])) {
+                 $this->_show_intro_fullview = $_CONF['show_intro_fullview'];
+             } else {
+                 $this->_show_intro_fullview = 1;
+             }
  
              $this->_commentcode = $_CONF['comment_code'];
              $this->_trackbackcode = $_CONF['trackback_code'];
***************
*** 908,913 ****
--- 927,936 ----
              if (!isset($_CONF['show_topic_icon'])) {
                  $_CONF['show_topic_icon'] = 1;
              }
+             
+             if (!isset($_CONF['show_intro_fullview'])) {
+                 $_CONF['show_intro_fullview'] = 1;
+             }
  
              if (DB_getItem($_TABLES['topics'], 'archive_flag', "tid = '{$tmptid}'") == 1) {
                  $this->_frontpage = 0;
***************
*** 924,929 ****
--- 947,953 ----
              $this->_trackbackcode = $_CONF['trackback_code'];
              $this->_statuscode = 0;
              $this->_show_topic_icon = $_CONF['show_topic_icon'];
+             $this->_show_intro_fullview = $_CONF['show_intro_fullview'];
              $this->_owner_id = $_USER['uid'];
              $this->_group_id = $T['group_id'];
              $this->_perm_owner = $T['perm_owner'];
***************
*** 1864,1869 ****
--- 1888,1899 ----
          } elseif ($this->_show_topic_icon != 1) {
              $this->_show_topic_icon = 0;
          }
+         
+         if ($this->_show_intro_fullview === 'on') {
+             $this->_show_intro_fullview = 1;
+         } elseif ($this->_show_intro_fullview != 1) {
+             $this->_show_intro_fullview = 0;
+         }
      }
  // End Private Methods.
  
diff -crB geeklog_fresh/system/lib-story.php geeklog/system/lib-story.php
*** geeklog_fresh/system/lib-story.php	Thu Jan 22 20:19:56 2009
--- geeklog/system/lib-story.php	Sat Apr 11 14:03:12 2009
***************
*** 284,290 ****
  
              $article->set_var( 'story_introtext', $introtext . '<br' . XHTML . '><br' . XHTML . '>'
                                 . $bodytext );
!             $article->set_var( 'story_text_no_br', $introtext . $bodytext );
          }
          $article->set_var( 'story_introtext_only', $introtext );
          $article->set_var( 'story_bodytext_only', $bodytext );
--- 284,295 ----
  
              $article->set_var( 'story_introtext', $introtext . '<br' . XHTML . '><br' . XHTML . '>'
                                 . $bodytext );
!                    
!             if( $story->displayElements( 'show_intro_fullview' ) ) { // bad name for a multi-getter
!                 $article->set_var( 'story_text_no_br', $introtext . $bodytext );
!             } else {
!                 $article->set_var( 'story_text_no_br', $bodytext );
!             }
          }
          $article->set_var( 'story_introtext_only', $introtext );
          $article->set_var( 'story_bodytext_only', $bodytext );
***************
*** 311,317 ****
                             ( $index == 'p' ) ? 'preview' : 'article' );
          $article->set_var( 'story_counter', 0 );
      }
!     else
      {
          $article->set_var( 'story_introtext', $introtext );
          $article->set_var( 'story_text_no_br', $introtext );
--- 316,322 ----
                             ( $index == 'p' ) ? 'preview' : 'article' );
          $article->set_var( 'story_counter', 0 );
      }
!     else // for lists, etc.
      {
          $article->set_var( 'story_introtext', $introtext );
          $article->set_var( 'story_text_no_br', $introtext );
***************
*** 971,976 ****
--- 976,985 ----
          if (empty($args['show_topic_icon'])) {
              $args['show_topic_icon'] = $_CONF['show_topic_icon'];
          }
+         
+         if (empty($args['show_intro_fullview'])) {
+             $args['show_intro_fullview'] = $_CONF['show_intro_fullview'];
+         }
      }
      /* - END: Set all the defaults - */
  
***************
*** 1402,1408 ****
              . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid)" . COM_getPermSQL('AND', $_USER['uid'], 2, 's') . $order . $limit;
  
          $sql['mssql'] =
!             "SELECT STRAIGHT_JOIN s.sid, s.uid, s.draft_flag, s.tid, s.date, s.title, CAST(s.introtext AS text) AS introtext, CAST(s.bodytext AS text) AS bodytext, s.hits, s.numemails, s.comments, s.trackbacks, s.related, s.featured, s.show_topic_icon, s.commentcode, s.trackbackcode, s.statuscode, s.expire, s.postmode, s.frontpage, s.in_transit, s.owner_id, s.group_id, s.perm_owner, s.perm_group, s.perm_members, s.perm_anon, s.advanced_editor_mode, " . " UNIX_TIMESTAMP(s.date) AS unixdate, UNIX_TIMESTAMP(s.expire) as expireunix, " . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid)" . COM_getPermSQL('AND', $_USER['uid'], 2, 's') . $order . $limit;
  
          $result = DB_query($sql);
  
--- 1411,1417 ----
              . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid)" . COM_getPermSQL('AND', $_USER['uid'], 2, 's') . $order . $limit;
  
          $sql['mssql'] =
!             "SELECT STRAIGHT_JOIN s.sid, s.uid, s.draft_flag, s.tid, s.date, s.title, CAST(s.introtext AS text) AS introtext, CAST(s.bodytext AS text) AS bodytext, s.hits, s.numemails, s.comments, s.trackbacks, s.related, s.featured, s.show_topic_icon, s.show_intro_fullview, s.commentcode, s.trackbackcode, s.statuscode, s.expire, s.postmode, s.frontpage, s.in_transit, s.owner_id, s.group_id, s.perm_owner, s.perm_group, s.perm_members, s.perm_anon, s.advanced_editor_mode, " . " UNIX_TIMESTAMP(s.date) AS unixdate, UNIX_TIMESTAMP(s.expire) as expireunix, " . "u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl " . "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u, {$_TABLES['topics']} AS t " . "WHERE (s.uid = u.uid) AND (s.tid = t.tid)" . COM_getPermSQL('AND', $_USER['uid'], 2, 's') . $order . $limit;
  
          $result = DB_query($sql);
  
diff -crB geeklog_fresh/system/lib-syndication.php geeklog/system/lib-syndication.php
*** geeklog_fresh/system/lib-syndication.php	Thu Jan 22 20:19:56 2009
--- geeklog/system/lib-syndication.php	Sat Apr 11 21:20:55 2009
***************
*** 257,263 ****
          $topic = stripslashes( DB_getItem( $_TABLES['topics'], 'topic',
                                 "tid = '$tid'" ));
  
!         $result = DB_query( "SELECT sid,uid,title,introtext,bodytext,postmode,UNIX_TIMESTAMP(date) AS modified,commentcode,trackbackcode FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() AND tid = '$tid' AND perm_anon > 0 ORDER BY date DESC $limitsql" );
  
          $nrows = DB_numRows( $result );
  
--- 257,263 ----
          $topic = stripslashes( DB_getItem( $_TABLES['topics'], 'topic',
                                 "tid = '$tid'" ));
  
!         $result = DB_query( "SELECT sid,uid,title,introtext,bodytext,show_intro_fullview,postmode,UNIX_TIMESTAMP(date) AS modified,commentcode,trackbackcode FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() AND tid = '$tid' AND perm_anon > 0 ORDER BY date DESC $limitsql" );
  
          $nrows = DB_numRows( $result );
  
***************
*** 267,273 ****
              $sids[] = $row['sid'];
  
              $storytitle = stripslashes( $row['title'] );
!             $fulltext = stripslashes( $row['introtext']."\n".$row['bodytext'] );
              $fulltext = PLG_replaceTags( $fulltext );
              $storytext = SYND_truncateSummary( $fulltext, $contentLength );
  
--- 267,277 ----
              $sids[] = $row['sid'];
  
              $storytitle = stripslashes( $row['title'] );
!             $fulltext= '';
!             if( $row[ 'show_intro_fullview' ] == 1 ) {
!                 $fulltext.= stripslashes( $row['introtext'] ) . "\n";
!             }
!             $fulltext.= stripslashes( $row['bodytext'] );
              $fulltext = PLG_replaceTags( $fulltext );
              $storytext = SYND_truncateSummary( $fulltext, $contentLength );