Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon Jan 24 00:10:09 2005 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

1. Files compared

# Location File Last Modified
1 e:\tech\cvs\coppermine\stable-head\include init.inc.php Sun Oct 24 13:15:10 2004 UTC
2 e:\tech\cvs\coppermine\stable\include init.inc.php Sun Jan 23 23:19:37 2005 UTC

2. Comparison summary

Description Between
Files 1 and 2
Blocks Lines
Unchanged 3 389
Changed 0 0
Inserted 2 4
Removed 0 0

3. Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Hidden in comparison detail

4. Active regular expressions

No regular expressions were active.

5. Comparison detail

1   <?php   1   <?php
2   // ------------------------------------------------------------------------- //   2   // ------------------------------------------------------------------------- //
3   // Coppermine Photo Gallery 1.3.2                                            //   3   // Coppermine Photo Gallery 1.3.2                                            //
4   // ------------------------------------------------------------------------- //   4   // ------------------------------------------------------------------------- //
(22 unchanged lines omitted)
27   // define('UDB_INTEGRATION', 'yabbse');   27   // define('UDB_INTEGRATION', 'yabbse');
28   // define('UDB_INTEGRATION', 'smf');   28   // define('UDB_INTEGRATION', 'smf');
29   // define('UDB_INTEGRATION', 'woltlab21');   29   // define('UDB_INTEGRATION', 'woltlab21');
30   // define('UDB_INTEGRATION', 'punbb');   30   // define('UDB_INTEGRATION', 'punbb');
    31   //define('UDB_INTEGRATION', 'e107');
31   if (!defined('IN_COPPERMINE')) die('Not in Coppermine...');   32   if (!defined('IN_COPPERMINE')) die('Not in Coppermine...');
    33  
    34   if (defined('UDB_INTEGRATION') && (UDB_INTEGRATION == 'e107')) require_once("../../class2.php"); // must start before cpg buffering or other init
    35  
32   // Start output buffering   36     // Start output buffering
33   ob_start();   37     ob_start();
34   // Report all errors except E_NOTICE   38   // Report all errors except E_NOTICE
35   // This is the default value set in php.ini   39   // This is the default value set in php.ini
(350 unchanged lines omitted)
386   }   390   }
387     391  
388     392  
389   ?>   393   ?>