mantisbt bugnote_update.php,1.41,1.42 bugnote_view_inc.php,1.18,1.19 config_defaults_inc.php,1.207,1.208

Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20956

Modified Files:
        bugnote_update.php bugnote_view_inc.php 
        config_defaults_inc.php 
Log Message:
- 0002091: [bugtracker] Bugnotes containing urls with the '@' sign in them get 
mangled (bpfennig)
- 0004326: [bugtracker] Links protected by brackets are not processed properly 
(bpfennig)
- 0003276: [feature] Add bugnote numbering and bugnote links. (bpfennig)
- 0004383: [localization] Editing a note has language specific note at end of 
note (bpfennig)


Index: bugnote_view_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bugnote_view_inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bugnote_view_inc.php        8 Aug 2004 11:39:00 -0000       1.18
+++ bugnote_view_inc.php        21 Sep 2004 07:35:09 -0000      1.19
@@ -82,8 +82,14 @@
                # prefix all bugnote data with v3_
                $row = db_fetch_array( $result );
                extract( $row, EXTR_PREFIX_ALL, 'v3' );
+               if ( db_unixtimestamp( $v3_date_submitted ) != 
db_unixtimestamp( $v3_last_modified ) )
+                       $t_bugnote_modified = true;
+               else
+                       $t_bugnote_modified = false;
+               
                $v3_date_submitted = date( config_get( 'normal_date_format' ), 
( db_unixtimestamp( $v3_date_submitted ) ) );
-
+               $v3_last_modified = date( config_get( 'normal_date_format' ), ( 
db_unixtimestamp( $v3_last_modified ) ) );
+               
                # grab the bugnote text and id and prefix with v3_
                $query = "SELECT note
                                FROM $t_bugnote_text_table
@@ -93,7 +99,8 @@
 
                $v3_note = $row['note'];
                $v3_note = string_display_links( $v3_note );
-
+               $t_bugnote_id_formatted = bugnote_format_id( $v3_id );
+               
                if ( VS_PRIVATE == $v3_view_state ) {
                        $t_bugnote_css          = 'bugnote-private';
                        $t_bugnote_note_css     = 'bugnote-note-private';
@@ -104,13 +111,20 @@
 ?>
 <tr class="bugnote">
        <td class="<?php echo $t_bugnote_css ?>">
+               <a name="<?php echo $v3_id ?>" id="<?php echo $v3_id ?>" />
+               <span class="small">(<?php echo $t_bugnote_id_formatted 
?>)</span><br />
                <?php print_user( $v3_reporter_id ) ?>
                <?php if ( VS_PRIVATE == $v3_view_state ) { ?>
                <span class="small">[ <?php echo lang_get( 'private' ) ?> 
]</span>
                <?php } ?>
                <br />
-               <span class="small"><?php echo $v3_date_submitted ?></span><br 
/><br />
-               <span class="small">
+               <span class="small"><?php echo $v3_date_submitted ?></span><br 
/>
+               <?php
+               if ( true == $t_bugnote_modified ) {
+                       echo '<span class="small">'.lang_get( 'edited_on').' 
'.$v3_last_modified.'</span><br />';
+               }
+               ?>
+               <br /><span class="small">
                <?php
                        # only admins and the bugnote creator can edit/delete 
this bugnote
                        # bug must be open to be editable

Index: bugnote_update.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bugnote_update.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- bugnote_update.php  17 May 2004 11:47:34 -0000      1.41
+++ bugnote_update.php  21 Sep 2004 07:35:09 -0000      1.42
@@ -41,8 +41,7 @@
        }
        
        $f_bugnote_text = trim( $f_bugnote_text ) . "\n\n";
-       $f_bugnote_text .= lang_get( 'edited_on' ) . date( config_get( 
'normal_date_format' ) );
-
+       
        bugnote_set_text( $f_bugnote_id, $f_bugnote_text );
 
        print_successful_redirect( string_get_bug_view_url( $t_bug_id ) . 
'#bugnotes' );

Index: config_defaults_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/config_defaults_inc.php,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- config_defaults_inc.php     12 Sep 2004 13:57:21 -0000      1.207
+++ config_defaults_inc.php     21 Sep 2004 07:35:09 -0000      1.208
@@ -967,6 +967,12 @@
        # eg. for bug: a link would be bug:98
        $g_bug_link_tag                 = '#';
 
+       # --- Bugnote Linking ---------------
+       # if a number follows this tag it will create a link to a bugnote.
+       # eg. for ~ a link would be ~45
+       # eg. for bugnote: a link would be bugnote:98
+       $g_bugnote_link_tag                     = '~';
+
        # --- Bug Count Linking ----------
        # this is the prefix to use when creating links to bug views from bug 
counts (eg. on the main
        # page and the summary page).



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php