[geeklog-cvs] tools/lm README,1.5,1.6 lm.php,1.6,1.7

[Dirk Haun]

Update of /cvsroot/geeklog/tools/lm
In directory qs1489.pair.com:/tmp/cvs-serv76624

Modified Files:
	README lm.php 
Log Message:
Fixed handling of <br> tags for XHTML (and patch the accidentally created <brXHTML> tags)


Index: README
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README	29 Apr 2008 18:47:45 -0000	1.5
--- README	6 May 2008 18:24:35 -0000	1.6
***************
*** 1,3 ****
! lm.php v1.0
  
  This script merges a Geeklog (foreign) language file with the english.php
--- 1,3 ----
! lm.php v1.0.1
  
  This script merges a Geeklog (foreign) language file with the english.php
***************
*** 51,62 ****
  History
  
! 0.1  first public release
! 0.2  make sure lines containing \n are enclosed in double quotes
! 0.3  added support for $LANG_PDF (Geeklog 1.3.10), introduced multibyte version
! 0.5  updated for Geeklog 1.4.0
! 0.6  updated for Geeklog 1.4.1
! 0.7  updated for Geeklog 1.5.0
! 0.8  merged lm.php and mblm.php into one script; added XHTML support
! 0.9  moved updating code into includes; now supports plugins
! 1.0  now supports core language files and all 5 default plugins
  
--- 51,63 ----
  History
  
! 0.1   first public release
! 0.2   make sure lines containing \n are enclosed in double quotes
! 0.3   added support for $LANG_PDF (Geeklog 1.3.10), introduced multibyte version
! 0.5   updated for Geeklog 1.4.0
! 0.6   updated for Geeklog 1.4.1
! 0.7   updated for Geeklog 1.5.0
! 0.8   merged lm.php and mblm.php into one script; added XHTML support
! 0.9   moved updating code into includes; now supports plugins
! 1.0   now supports core language files and all 5 default plugins
! 1.0.1 fixed handling of <br> tags and fixed accidentally created <brXHTML> tags
  

Index: lm.php
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/lm.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lm.php	29 Apr 2008 18:47:45 -0000	1.6
--- lm.php	6 May 2008 18:24:35 -0000	1.7
***************
*** 33,37 ****
  // $Id$
  
! $VERSION = '1.0';
  
  // Prevent PHP from reporting uninitialized variables
--- 33,37 ----
  // $Id$
  
! $VERSION = '1.0.1';
  
  // Prevent PHP from reporting uninitialized variables
***************
*** 68,71 ****
--- 68,72 ----
  }
  
+ define('XHTML', '');
  
  // list of all variables accessed in the language file
***************
*** 145,148 ****
--- 146,152 ----
  {
      global $mb;
+ 
+     // fix accidentally created <brXHTML> tags in some 1.5.0b1 language files
+     $txt = my_str_replace('brXHTML', 'br', $txt);
  
      if ($mb) {