Changeset [d796a6cf2cace81e0de5b823573d19e06d8a7428] by Phillip Ball

Revision d796a6cf2cace81e0de5b823573d19e06d8a7428, committed by Phillip Ball · July 26th, 2011 @ 04:23 AM

Merge remote branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/d796a6cf2cace81e...

58 changed files

R compat.php
R compat/array_combine.php
R compat/array_diff_assoc.php
R compat/array_map.php
R compat/array_search.php
R compat/array_udiff.php
R compat/array_udiff_assoc.php
R compat/array_udiff_uassoc.php
R compat/array_uintersect_assoc.php
R compat/array_uintersect_uassoc.php
R compat/array_walk_recursive.php
R compat/convert_uudecode.php
R compat/convert_uuencode.php
R compat/file_get_contents.php
R compat/file_put_contents.php
R compat/fprintf.php
R compat/gd_info.php
R compat/get_include_path.php
R compat/html_entity_decode.php
R compat/http_build_query.php
R compat/image_type_to_mime_type.php
R compat/is_really_writable.php
R compat/ob_get_clean.php
R compat/ob_get_flush.php
R compat/restore_include_path.php
R compat/scandir.php
R compat/set_include_path.php
R compat/str_ireplace.php
R compat/str_shuffle.php
R compat/str_split.php
R compat/str_word_count.php
R compat/stripos.php
R compat/strpbrk.php
R compat/strripos.php
R compat/substr_compare.php
R compat/sys_get_temp_dir.php
R deps.php
R exponent_common.php
R exponent_compat.php
R exponent_constants2.php
R subsystems/pagingObject.info.php
R subsystems/pagingObject.manifest.php
R subsystems/pagingObject.php
R subsystems/sharedcore.info.php
R subsystems/sharedcore.manifest.php
R subsystems/sharedcore.php
R subsystems/webservices.info.php
R subsystems/webservices.manifest.php
R subsystems/webservices.php
R subsystems/webservices/nusoap.php
R subsystems/webservices/search/exclude.en.list
M external/phpThumb/phpThumb.config.php
M framework/modules/ecommerce/billingcalculators/payflowpro.php
M framework/modules/ecommerce/controllers/order_statusController.php
M framework/modules/ecommerce/controllers/order_typeController.php
M framework/modules/ecommerce/controllers/product_statusController.php
M framework/modules/ecommerce/controllers/sales_repController.php
M framework/modules/pixidou/includes/class.upload/class.upload.php