[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.677,1.678

Michael Jervis mjervis at qs1489.pair.com
Tue Feb 19 02:23:26 EST 2008


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

Modified Files:
	lib-common.php 
Log Message:
Stop [raw] and [/raw] eating the following character (mike can't count).

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.677
retrieving revision 1.678
diff -C2 -d -r1.677 -r1.678
*** lib-common.php	18 Feb 2008 19:42:12 -0000	1.677
--- lib-common.php	19 Feb 2008 07:23:24 -0000	1.678
***************
*** 2954,2964 ****
              if( $end_pos !== false )
              {
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 6,
!                         $end_pos - ( $start_pos + 6 )));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.
                  $encoded = '[raw2]' . $encoded . '[/raw2]';
                  $str = MBYTE_substr( $str, 0, $start_pos ) . $encoded
!                      . MBYTE_substr( $str, $end_pos + 7 );
              }
              else // missing [/raw]
--- 2954,2964 ----
              if( $end_pos !== false )
              {
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 5,
!                         $end_pos - ( $start_pos + 5 )));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.
                  $encoded = '[raw2]' . $encoded . '[/raw2]';
                  $str = MBYTE_substr( $str, 0, $start_pos ) . $encoded
!                      . MBYTE_substr( $str, $end_pos + 6 );
              }
              else // missing [/raw]
***************
*** 2968,2972 ****
                  // better be checking for missing [/raw] before calling this
                  // function ...
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 6 ));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.
--- 2968,2972 ----
                  // better be checking for missing [/raw] before calling this
                  // function ...
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 5 ));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.




More information about the geeklog-cvs mailing list