Merge remote branch 'upstream/master'

2010-10-10 20:36:47 +02:00 · 2010-10-10 20:36:47 +02:00 · dd5191ba90
commit dd5191ba90
parent 6728fab4ef 3640bd60bb
3691 changed files with 125770 additions and 72 deletions
--- a/3.0/client/Java/Demo.class
+++ b/3.0/client/Java/Demo.class
--- a/3.0/client/Java/Demo.java
+++ b/3.0/client/Java/Demo.java
--- a/3.0/client/Java/README
+++ b/3.0/client/Java/README
--- a/3.0/client/Java/build.sh
+++ b/3.0/client/Java/build.sh
--- a/3.0/client/Java/lib/commons-logging-api-1.1.1.jar
+++ b/3.0/client/Java/lib/commons-logging-api-1.1.1.jar
--- a/3.0/client/Java/lib/gson-1.4.jar
+++ b/3.0/client/Java/lib/gson-1.4.jar
--- a/3.0/client/Java/lib/httpclient-4.0.1.jar
+++ b/3.0/client/Java/lib/httpclient-4.0.1.jar
--- a/3.0/client/Java/lib/httpcore-4.0.1.jar
+++ b/3.0/client/Java/lib/httpcore-4.0.1.jar
--- a/3.0/client/Java/run.sh
+++ b/3.0/client/Java/run.sh
--- a/3.0/client/PHP/.gitignore
+++ b/3.0/client/PHP/.gitignore
--- a/3.0/client/PHP/Gallery3.php
+++ b/3.0/client/PHP/Gallery3.php
--- a/3.0/client/PHP/README
+++ b/3.0/client/PHP/README
--- a/3.0/client/PHP/example.php
+++ b/3.0/client/PHP/example.php
--- a/3.0/client/PHP/test1.png
+++ b/3.0/client/PHP/test1.png
--- a/3.0/client/PHP/test2.png
+++ b/3.0/client/PHP/test2.png
--- a/3.0/modules/adsense/controllers/admin_adsense.php
+++ b/3.0/modules/adsense/controllers/admin_adsense.php
--- a/3.0/modules/adsense/helpers/adsense_block.php
+++ b/3.0/modules/adsense/helpers/adsense_block.php
--- a/3.0/modules/adsense/helpers/adsense_event.php
+++ b/3.0/modules/adsense/helpers/adsense_event.php
--- a/3.0/modules/adsense/helpers/adsense_theme.php
+++ b/3.0/modules/adsense/helpers/adsense_theme.php
--- a/3.0/modules/adsense/module.info
+++ b/3.0/modules/adsense/module.info
--- a/3.0/modules/adsense/views/admin_adsense.html.php
+++ b/3.0/modules/adsense/views/admin_adsense.html.php
--- a/3.0/modules/adsense/views/adsense_block.html.php
+++ b/3.0/modules/adsense/views/adsense_block.html.php
--- a/3.0/modules/atom/helpers/atom.php
+++ b/3.0/modules/atom/helpers/atom.php
--- a/3.0/modules/atom/libraries/Atom_Author.php
+++ b/3.0/modules/atom/libraries/Atom_Author.php
--- a/3.0/modules/atom/libraries/Atom_Base.php
+++ b/3.0/modules/atom/libraries/Atom_Base.php
--- a/3.0/modules/atom/libraries/Atom_Entry.php
+++ b/3.0/modules/atom/libraries/Atom_Entry.php
--- a/3.0/modules/atom/libraries/Atom_Feed.php
+++ b/3.0/modules/atom/libraries/Atom_Feed.php
--- a/3.0/modules/atom/libraries/Atom_Link.php
+++ b/3.0/modules/atom/libraries/Atom_Link.php
--- a/3.0/modules/atom/libraries/Gallery_Atom_Entry.php
+++ b/3.0/modules/atom/libraries/Gallery_Atom_Entry.php
--- a/3.0/modules/atom/libraries/Gallery_Atom_Feed.php
+++ b/3.0/modules/atom/libraries/Gallery_Atom_Feed.php
--- a/3.0/modules/atom/libraries/Gallery_Atom_Link.php
+++ b/3.0/modules/atom/libraries/Gallery_Atom_Link.php
--- a/3.0/modules/autorotate/helpers/autorotate.php
+++ b/3.0/modules/autorotate/helpers/autorotate.php
--- a/3.0/modules/autorotate/helpers/autorotate_event.php
+++ b/3.0/modules/autorotate/helpers/autorotate_event.php
--- a/3.0/modules/autorotate/helpers/autorotate_installer.php
+++ b/3.0/modules/autorotate/helpers/autorotate_installer.php
--- a/3.0/modules/autorotate/lib/pel/Pel.php
+++ b/3.0/modules/autorotate/lib/pel/Pel.php
--- a/3.0/modules/autorotate/lib/pel/PelConvert.php
+++ b/3.0/modules/autorotate/lib/pel/PelConvert.php
--- a/3.0/modules/autorotate/lib/pel/PelDataWindow.php
+++ b/3.0/modules/autorotate/lib/pel/PelDataWindow.php
--- a/3.0/modules/autorotate/lib/pel/PelEntry.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntry.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryAscii.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryAscii.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryByte.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryByte.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryLong.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryLong.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryNumber.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryNumber.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryRational.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryRational.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryShort.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryShort.php
--- a/3.0/modules/autorotate/lib/pel/PelEntryUndefined.php
+++ b/3.0/modules/autorotate/lib/pel/PelEntryUndefined.php
--- a/3.0/modules/autorotate/lib/pel/PelException.php
+++ b/3.0/modules/autorotate/lib/pel/PelException.php
--- a/3.0/modules/autorotate/lib/pel/PelExif.php
+++ b/3.0/modules/autorotate/lib/pel/PelExif.php
--- a/3.0/modules/autorotate/lib/pel/PelFormat.php
+++ b/3.0/modules/autorotate/lib/pel/PelFormat.php
--- a/3.0/modules/autorotate/lib/pel/PelIfd.php
+++ b/3.0/modules/autorotate/lib/pel/PelIfd.php
--- a/3.0/modules/autorotate/lib/pel/PelJpeg.php
+++ b/3.0/modules/autorotate/lib/pel/PelJpeg.php
--- a/3.0/modules/autorotate/lib/pel/PelJpegComment.php
+++ b/3.0/modules/autorotate/lib/pel/PelJpegComment.php
--- a/3.0/modules/autorotate/lib/pel/PelJpegContent.php
+++ b/3.0/modules/autorotate/lib/pel/PelJpegContent.php
--- a/3.0/modules/autorotate/lib/pel/PelJpegMarker.php
+++ b/3.0/modules/autorotate/lib/pel/PelJpegMarker.php
--- a/3.0/modules/autorotate/lib/pel/PelTag.php
+++ b/3.0/modules/autorotate/lib/pel/PelTag.php
--- a/3.0/modules/autorotate/lib/pel/PelTiff.php
+++ b/3.0/modules/autorotate/lib/pel/PelTiff.php
--- a/3.0/modules/autorotate/module.info
+++ b/3.0/modules/autorotate/module.info
--- a/3.0/modules/basket/controllers/admin_configure.php
+++ b/3.0/modules/basket/controllers/admin_configure.php
--- a/3.0/modules/basket/controllers/admin_postage_bands.php
+++ b/3.0/modules/basket/controllers/admin_postage_bands.php
--- a/3.0/modules/basket/controllers/admin_product_lines.php
+++ b/3.0/modules/basket/controllers/admin_product_lines.php
--- a/3.0/modules/basket/controllers/basket.php
+++ b/3.0/modules/basket/controllers/basket.php
--- a/3.0/modules/basket/css/basket.css
+++ b/3.0/modules/basket/css/basket.css
--- a/3.0/modules/basket/helpers/basket.php
+++ b/3.0/modules/basket/helpers/basket.php
--- a/3.0/modules/basket/helpers/basket_block.php
+++ b/3.0/modules/basket/helpers/basket_block.php
--- a/3.0/modules/basket/helpers/basket_event.php
+++ b/3.0/modules/basket/helpers/basket_event.php
--- a/3.0/modules/basket/helpers/basket_installer.php
+++ b/3.0/modules/basket/helpers/basket_installer.php
@ -119,7 +119,7 @@ Thanks");
   basket::setOrderCompleteEmailSubject(
 "Photography Order %order_number");

-   module::set_version("basket", 4);
+   module::set_version("basket", 5);

  }

--- a/3.0/modules/basket/helpers/basket_theme.php
+++ b/3.0/modules/basket/helpers/basket_theme.php
--- a/3.0/modules/basket/helpers/postage_band.php
+++ b/3.0/modules/basket/helpers/postage_band.php
--- a/3.0/modules/basket/helpers/product.php
+++ b/3.0/modules/basket/helpers/product.php
--- a/3.0/modules/basket/images/basket.png
+++ b/3.0/modules/basket/images/basket.png
--- a/3.0/modules/basket/libraries/Paypal.php
+++ b/3.0/modules/basket/libraries/Paypal.php
--- a/3.0/modules/basket/libraries/Session_Basket.php
+++ b/3.0/modules/basket/libraries/Session_Basket.php
--- a/3.0/modules/basket/models/ipn_message.php
+++ b/3.0/modules/basket/models/ipn_message.php
--- a/3.0/modules/basket/models/item_product.php
+++ b/3.0/modules/basket/models/item_product.php
--- a/3.0/modules/basket/models/order.php
+++ b/3.0/modules/basket/models/order.php
--- a/3.0/modules/basket/models/postage_band.php
+++ b/3.0/modules/basket/models/postage_band.php
--- a/3.0/modules/basket/models/product.php
+++ b/3.0/modules/basket/models/product.php
--- a/3.0/modules/basket/models/product_override.php
+++ b/3.0/modules/basket/models/product_override.php
--- a/3.0/modules/basket/module.info
+++ b/3.0/modules/basket/module.info
--- a/3.0/modules/basket/views/add_to_basket.html.php
+++ b/3.0/modules/basket/views/add_to_basket.html.php
--- a/3.0/modules/basket/views/add_to_basket_ajax.html.php
+++ b/3.0/modules/basket/views/add_to_basket_ajax.html.php
--- a/3.0/modules/basket/views/admin_configure.html.php
+++ b/3.0/modules/basket/views/admin_configure.html.php
--- a/3.0/modules/basket/views/admin_postage_bands.html.php
+++ b/3.0/modules/basket/views/admin_postage_bands.html.php
--- a/3.0/modules/basket/views/admin_product_lines.html.php
+++ b/3.0/modules/basket/views/admin_product_lines.html.php
--- a/3.0/modules/basket/views/admin_templates.html.php
+++ b/3.0/modules/basket/views/admin_templates.html.php
--- a/3.0/modules/basket/views/basket-side-bar.html.php
+++ b/3.0/modules/basket/views/basket-side-bar.html.php
--- a/3.0/modules/basket/views/basket.html.php
+++ b/3.0/modules/basket/views/basket.html.php
--- a/3.0/modules/basket/views/checkout.html.php
+++ b/3.0/modules/basket/views/checkout.html.php
--- a/3.0/modules/basket/views/confirm_order.html.php
+++ b/3.0/modules/basket/views/confirm_order.html.php
--- a/3.0/modules/basket/views/order_complete.html.php
+++ b/3.0/modules/basket/views/order_complete.html.php
--- a/3.0/modules/basket/views/paypal_redirect.html.php
+++ b/3.0/modules/basket/views/paypal_redirect.html.php
--- a/3.0/modules/basket/views/pew1.html.php
+++ b/3.0/modules/basket/views/pew1.html.php
--- a/3.0/modules/basket/views/pew2.html.php
+++ b/3.0/modules/basket/views/pew2.html.php
--- a/3.0/modules/basket/views/print_order.html.php
+++ b/3.0/modules/basket/views/print_order.html.php
--- a/3.0/modules/basket/views/view_basket.html.php
+++ b/3.0/modules/basket/views/view_basket.html.php
--- a/3.0/modules/basket/views/view_ipn.html.php
+++ b/3.0/modules/basket/views/view_ipn.html.php
--- a/3.0/modules/basket/views/view_order.html.php
+++ b/3.0/modules/basket/views/view_order.html.php
--- a/3.0/modules/basket/views/view_orders.html.php
+++ b/3.0/modules/basket/views/view_orders.html.php
--- a/3.0/modules/batchtag/controllers/batchtag.php
+++ b/3.0/modules/batchtag/controllers/batchtag.php
--- a/3.0/modules/batchtag/helpers/batchtag_block.php
+++ b/3.0/modules/batchtag/helpers/batchtag_block.php
--- a/3.0/modules/batchtag/helpers/batchtag_event.php
+++ b/3.0/modules/batchtag/helpers/batchtag_event.php
--- a/Show More
+++ b/Show More