From: <mo...@us...> - 2004-09-08 19:53:38
|
Update of /cvsroot/tikiwiki/tiki/lib/diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3056/lib/diff Modified Files: difflib.php renderer.php renderer_unified.php Log Message: Instant-Auto-Merge from BRANCH-1-9 to HEAD Index: difflib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/diff/difflib.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- difflib.php 27 Aug 2004 21:04:17 -0000 1.8 +++ difflib.php 8 Sep 2004 19:52:27 -0000 1.9 @@ -1,6 +1,13 @@ <?php // $Header$ +//this script may only be included - so its better to die if called directly. +if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { + header("location: index.php"); + exit; +} + + function diff2($page1, $page2, $type='sidediff') { $page1 = split("\n", $page1); $page2 = split("\n", $page2); Index: renderer.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/diff/renderer.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- renderer.php 17 Aug 2004 16:33:31 -0000 1.7 +++ renderer.php 8 Sep 2004 19:52:27 -0000 1.8 @@ -1,6 +1,12 @@ <?php // $Header$ +//this script may only be included - so its better to die if called directly. +if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { + header("location: index.php"); + exit; +} + /** * A class to render Diffs in different formats. * Index: renderer_unified.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/diff/renderer_unified.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- renderer_unified.php 27 Aug 2004 21:04:18 -0000 1.5 +++ renderer_unified.php 8 Sep 2004 19:52:27 -0000 1.6 @@ -1,6 +1,12 @@ <?php // $Header$ +//this script may only be included - so its better to die if called directly. +if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { + header("location: index.php"); + exit; +} + /** * "Unified" diff renderer. * |