What modifications may be moved into my template?

[toer]

I run a modified water_drop theme but I have succeeded to include only a few of the changes in the template.
So, these are the modified 'core files':

Code Select Expand


  displayimage.php         
  exifmgr.php             
  edit_one_pic.php         
  editpics.php             
  include/exif.php         
  include/exif_php.inc.php
  include/functions.inc.php
  include/init.inc.php     
  include/picmgmt.inc.php 
  lang/swedish.php
The actual modifications are essentially described (except language) in
http://forum.coppermine-gallery.net/index.php/topic,74588.0.html
(thanks, so far, for the hints to get started!)

What is the best way to handle these things in order to be prepared for the next CPG upgrade? What modifications may be moved into my template?

Or, is there a nice way to handle upgrades with some 'diff' technique? Else, this will certainly generate much headache at each upgrade occasion ...!?

[toer]

Please, did I miss some reading somewhere, or ...?

[Αndré]

What modifications may be moved into my template?

It's not possible to determine if you can include some of the changes in that files to your theme by just looking at that list. Probably it's not possible or quite hard, as the theme engine just displays delivered data. Maybe it's possible with the plugin engine.

is there a nice way to handle upgrades with some 'diff' technique?

This is my approach:
- Checkout either the cpg1.5.x trunk or a particular cpg1.5.x tag from our SVN repository.
- Apply all your modifications to that files.
- When you want to update your gallery, just perform an SVN update (or SVN switch, depending on what you've chosen in the first step). This will update all files to the latest version while keeping your modification, if there are no conflicts.
- Now you're ready to export and upload the files to your actual gallery.

[toer]

I see. Sorry not to be very well acquainted neither with svn nor git but I will try to improve!