php errors every time I update via CVS

php errors every time I update via CVS

by Simon Bryan -
Number of replies: 1
Hi all,
Since doing an upgrade to 1.9, every time I do a cvs update I get errors in a number of the php files, normally it is the headers from the old an new version are both included in the file along with some comment lines. I manually remove the extra lines and go on to the next issue. When i look n the directory there is a second copy of the file with the name prefixed with a # symbol.
Unfortunatley i have not recorded if they are the same files each time. WHile the fix is easy it is very annoying.
However the lates update done today gave me a bit of extra grie that I am hoping I have fixed correclty. In the admin/settings/upgradesettings.php file I got an error message about not being able to 'unset' the variables in this section:

$newsettings = admin_output_new_settings_by_page($adminroot);
if (isset($newsettings['frontpagesettings'])) {
$frontpage = $newsettings['frontpagesettings'];
// unset($newsettings['frontpagesettings']);
array_unshift($newsettings, $frontpage);

I commented out the unset command and everything seems normal, but that does not seem right.

Any thoughts?

Average of ratings: -