Hi,
this is my first post on this forum
My problem is with a patch i have made:
I really don't understand why it fails.
patch was made with this options:
# diff -Pua oldfile.php newfile.php > patch-diff
when i run:
# patch -p1 < patch.diff
i get:
Code:
patching file index.php
Hunk #1 FAILED at 108.
1 out of 1 hunk FAILED -- saving rejects to file index.php.rej
index.inc.php, section form line 108
Code:
$module = $startmodule;
} else {
// or as the default value summary
$module = 'summary';
}
}
// redirect to where the user wanted to go, except logout page
if (strlen($_REQUEST['return_path']) and !ereg('logout', $_REQUEST['return_path'])) {
$return_path = urldecode($_REQUEST['return_path']);
if($return_path == '/'){
$return_path .= 'index.php';
}
patch file
Code:
diff --exclude='*~' --exclude='*.odt' --exclude='tpls_c*' --exclude='chat*' --exclude=config.inc.php -Puar old/index.php new/index.php
--- old/index.php 2006-03-23 20:14:08.000000000 +0100
+++ new/index.php 2006-04-11 00:39:29.000000000 +0200
@@ -108,7 +108,7 @@
$module = $startmodule;
} else {
// or as the default value summary
- $module = 'summary';
+ $module = 'modulistica';
}
}
