diff -rB geeklog_fresh/language/english_utf-8.php geeklog/language/english_utf-8.php
735c735
<     26 => 'Story Preview',
---
>     26 => 'Full Story Preview',
797c797,799
<     88 => 'Wiki-style format'
---
>     88 => 'Wiki-style format',
>     89 => 'Show Intro Text in Full View',
>     90 => 'Compact Story Preview'
1717a1720
>     'show_intro_fullview' => "Show Intro Text in Full View",
diff -rB geeklog_fresh/public_html/admin/install/config-install.php geeklog/public_html/admin/install/config-install.php
104a105
>     $c->add('show_intro_fullview',1,'select',1,7,0,1275,TRUE);
diff -rB geeklog_fresh/public_html/admin/story.php geeklog/public_html/admin/story.php
346,353c346,362
<         $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'));
---
>         $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' ) );
359c368
<         if (!empty ($previewContent)) {
---
>         if (!empty ($previewContentCompact) || !empty( $previewContentFull )) {
542a552,563
>     $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', '');
>     }
diff -rB geeklog_fresh/public_html/layout/professional/admin/story/storyeditor.thtml geeklog/public_html/layout/professional/admin/story/storyeditor.thtml
72a73,78
>                                         <td class="alignright">{lang_show_intro_fullview}:</td>
>                                         <td>
>                                             <input type="checkbox" name="show_intro_fullview" {show_intro_fullview_checked}{xhtml}>
>                                         </td>
>                                     </tr>
>                                     <tr>
diff -rB geeklog_fresh/public_html/layout/professional/admin/story/storyeditor_advanced.thtml geeklog/public_html/layout/professional/admin/story/storyeditor_advanced.thtml
58,59c58,65
<                 <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>
---
>                 <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>
227c233,240
<         {preview_content}
---
>         <fieldset>
>             <legend>{lang_compact_story_preview}</legend>
>             {preview_content_compact}
>         </fieldset>
>         <fieldset>
>             <legend>{lang_full_story_preview}</legend>
>             {preview_content_full}
>         </fieldset>
diff -rB geeklog_fresh/public_html/profiles.php geeklog/public_html/profiles.php
303c303
<     $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day FROM {$_TABLES['stories']} WHERE sid = '$sid'";
---
>     $sql = "SELECT uid,title,introtext,bodytext,show_intro_fullview,commentcode,UNIX_TIMESTAMP(date) AS day FROM {$_TABLES['stories']} WHERE sid = '$sid'";
328,330c328,332
<     $mailtext .= LB
<         . COM_undoSpecialChars(stripslashes(strip_tags($A['introtext']))).LB.LB
<         . COM_undoSpecialChars(stripslashes(strip_tags($A['bodytext']))).LB.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
diff -rB geeklog_fresh/sql/mssql_tableanddata.php geeklog/sql/mssql_tableanddata.php
255a256
>     [show_intro_fullview] [tinyint] NOT NULL ,
907a909
>     CONSTRAINT [DF_{$_TABLES['stories']}_show_intro_fullview] DEFAULT (1) FOR [show_intro_fullview],
diff -rB geeklog_fresh/sql/mysql_tableanddata.php geeklog/sql/mysql_tableanddata.php
275a276
>   show_intro_fullview tinyint(1) unsigned NOT NULL default '1',
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 -rB geeklog_fresh/system/classes/story.class.php geeklog/system/classes/story.class.php
122a123
>     var $_show_intro_fullview;
188a190
>            'show_intro_fullview' => 1,
230a233,237
>            'show_intro_fullview' => array
>               (
>                 STORY_AL_CHECKBOX,
>                 '_show_intro_fullview'
>               ),
407c414
<                 "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')";
---
>                 "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')";
425a433,438
>             
>             if (isset($_CONF['show_intro_fullview'])) {
>                 $this->_show_intro_fullview = $_CONF['show_intro_fullview'];
>             } else {
>                 $this->_show_intro_fullview = 1;
>             }
517a531,536
>             
>             if (isset($_CONF['show_intro_fullview'])) {
>                 $this->_show_intro_fullview = $_CONF['show_intro_fullview'];
>             } else {
>                 $this->_show_intro_fullview = 1;
>             }
910a930,933
>             
>             if (!isset($_CONF['show_intro_fullview'])) {
>                 $_CONF['show_intro_fullview'] = 1;
>             }
926a950
>             $this->_show_intro_fullview = $_CONF['show_intro_fullview'];
1866a1891,1896
>         
>         if ($this->_show_intro_fullview === 'on') {
>             $this->_show_intro_fullview = 1;
>         } elseif ($this->_show_intro_fullview != 1) {
>             $this->_show_intro_fullview = 0;
>         }
diff -rB geeklog_fresh/system/lib-story.php geeklog/system/lib-story.php
287c287,292
<             $article->set_var( 'story_text_no_br', $introtext . $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 );
>             }
314c319
<     else
---
>     else // for lists, etc.
973a979,982
>         
>         if (empty($args['show_intro_fullview'])) {
>             $args['show_intro_fullview'] = $_CONF['show_intro_fullview'];
>         }
1405c1414
<             "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;
---
>             "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;
diff -rB geeklog_fresh/system/lib-syndication.php geeklog/system/lib-syndication.php
260c260
<         $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" );
---
>         $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" );
270c270,274
<             $fulltext = stripslashes( $row['introtext']."\n".$row['bodytext'] );
---
>             $fulltext= '';
>             if( $row[ 'show_intro_fullview' ] == 1 ) {
>                 $fulltext.= stripslashes( $row['introtext'] ) . "\n";
>             }
>             $fulltext.= stripslashes( $row['bodytext'] );