[mxbb-commits] core/includes mx_functions.php,1.35,1.36

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16419/includes

Modified Files:
	mx_functions.php 
Log Message:
  weird conflict...did you edit these lately...i see no diff??

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** mx_functions.php	13 Apr 2005 21:23:25 -0000	1.35
--- mx_functions.php	16 Apr 2005 21:51:35 -0000	1.36
***************
*** 257,261 ****
             WHERE blk.function_id = fnc.function_id
             AND mdl.module_id = fnc.module_id
!          AND fnc.function_file = 'mx_dynamic.php'
             ORDER BY  mdl.module_name ASC, fnc.function_name ASC";
     }
--- 257,261 ----
             WHERE blk.function_id = fnc.function_id
             AND mdl.module_id = fnc.module_id
!            AND fnc.function_file = 'mx_dynamic.php'
             ORDER BY  mdl.module_name ASC, fnc.function_name ASC";
     }
***************
*** 273,277 ****
             WHERE blk.function_id = fnc.function_id
             AND mdl.module_id = fnc.module_id
!          AND fnc.function_file = '$function_file'
             ORDER BY  mdl.module_name ASC, fnc.function_name ASC";
     }
--- 273,277 ----
             WHERE blk.function_id = fnc.function_id
             AND mdl.module_id = fnc.module_id
!            AND fnc.function_file = '$function_file'
             ORDER BY  mdl.module_name ASC, fnc.function_name ASC";
     }