Fixes Tidypics#38 using custom uploadify

brettp · Jul 14, 2012 · ad181ca · ad181ca
1 parent 47fe584
commit ad181ca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
@@ -43,7 +43,7 @@
 	$content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
 } else {
 	elgg_load_js('swfobject');
-	elgg_load_js('jquery.uploadify');
+	elgg_load_js('jquery.uploadify-tp');
 	elgg_load_js('tidypics:uploading');
 	$content = elgg_view('forms/photos/ajax_upload', array('entity' => $album));
 }

diff --git a/start.php b/start.php
@@ -46,7 +46,7 @@ function tidypics_init() {
 
 	elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer');
 	elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer');
-	elgg_register_js('jquery.uploadify', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer');
+	elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer');
 
 	// Add photos link to owner block/hover menus
 	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');

diff --git a/views/default/tidypics/js/uploader.php b/views/default/tidypics/js/uploader.php