Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon Jan 24 00:13:02 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 admin.php Sat Jul 24 15:03:52 2004 UTC
2 e:\tech\cvs\coppermine\stable admin.php Sun Jan 23 22:11:52 2005 UTC

2. Comparison summary

Description Between
Files 1 and 2
Blocks Lines
Unchanged 3 39
Changed 0 0
Inserted 2 8
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   // ------------------------------------------------------------------------- //
(25 unchanged lines omitted)
30   $referer = $HTTP_GET_VARS['referer'] ? $HTTP_GET_VARS['referer'] : 'index.php';   30   $referer = $HTTP_GET_VARS['referer'] ? $HTTP_GET_VARS['referer'] : 'index.php';
31   $USER['am'] = $admin_mode;   31   $USER['am'] = $admin_mode;
32   if (!$admin_mode) $referer = 'index.php';   32   if (!$admin_mode) $referer = 'index.php';
33     33  
    34   if ($CONFIG['admin_confirm'])
    35   {
34   pageheader($lang_info, "<META http-equiv=\"refresh\" content=\"1;url=$referer\">");   36   pageheader($lang_info, "<META http-equiv=\"refresh\" content=\"1;url=$referer\">");
35   msg_box($lang_info, $lang_admin_php[$admin_mode], $lang_continue, $referer);   37   msg_box($lang_info, $lang_admin_php[$admin_mode], $lang_continue, $referer);
36   pagefooter();   38   pagefooter();
37   ob_end_flush();   39   ob_end_flush();
    40   } else {
    41           // go there directly
    42           user_save_profile(); // save new state
    43           header("Location:$referer");
    44           exit;
    45   }
38     46  
39   ?>   47   ?>