Two bugs in the 4.7 -> 5.x upgrade code

1st bug: from the instructions in the "UPGRADE" file one could think that the video module is only necessary if you already had video Acidfree nodes with the old version. However if you try to upgrade without the video module, then you get something like this:

Updating

An unrecoverable error has occured. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the update summary

Fatal error: Call to undefined function: _video_upload_check_settings() in /home/www-data/wmuzso2/www2/sites/all/modules/acidfree/acidfree.install on line 212"

This is because the upgrade code in acidfree.install/acidfree_update_3_do_conversion calls the _video_upload_check_settings function before checking again whether there're any video nodes. Solution is simple: move the _video_upload_check_settings call (adn actually all the video conversion) behind the db_query() and into a new if (db_num_rows($videos) > 0) { ... } condition (checking whether $videos has any rows in it).

2nd bug: I also had the following errors ...

* Created Acidfree vocabulary
* finished updating albums
* Finished updating images

* „/home/www-data/my_home/www/files/public/active” cannot be copied.
* „/home/www-data/my_home/www/files/public/active” cannot be copied.
...

Another "sideeffect" was that in the new images directory a lot of files were created with the mask "active_<nid>", where nid stands for the node id. The files had no extension.

The reason for this is that I had only thumbnail and small images in the old Acidfree, no large versions. However the upgrade code assumes that there're all three versions for all nodes.
For me the problem was solved by adding a new if ($fmimage) {...} around the code that is behind the line $fmimage = db_fetch_object(db_query("SELECT * FROM {file} WHERE fid = '{$image->$size}'")); ... however one could add a check around the pathinfo() call as well (just to handle the case when the file on the disk is not found).

PS: the second error message might not be fully correct because instead of "cannot be copied" I got the same in Hungarian (my mother tongue) and I translated it into English so everybody understands.