? 610546.patch Index: video_upload.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/video_upload/video_upload.install,v retrieving revision 1.6.2.5 diff -u -p -r1.6.2.5 video_upload.install --- video_upload.install 4 Sep 2009 20:51:16 -0000 1.6.2.5 +++ video_upload.install 29 Sep 2010 07:23:05 -0000 @@ -7,10 +7,6 @@ * Install/Uninstall/Enable/Disable hooks */ -// Updates happen in random order, whether or not the module is enabled, -// so include critical code here just to be sure. -include_once(drupal_get_path('module', 'content') .'/content.module'); - /** * Implementation of hook_install(). */ @@ -67,7 +63,7 @@ function video_upload_requirements($phas // Get GData-specific requirements. // @todo: Once there is more than one provider, this can't be run at the // install phase. - include_once drupal_get_path('module', 'video_upload') . '/video_upload.module'; + include_once 'video_upload.module'; video_upload_initialize_provider(); $gdata_requirements = _video_upload_gdata_requirements($phase); Index: video_upload.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/video_upload/video_upload.module,v retrieving revision 1.14.2.17 diff -u -p -r1.14.2.17 video_upload.module --- video_upload.module 9 Jun 2010 00:21:59 -0000 1.14.2.17 +++ video_upload.module 29 Sep 2010 07:23:06 -0000 @@ -9,6 +9,8 @@ * See TODO.txt, and inline todo comments */ +require_once 'video_upload_widget.inc'; + /** * Video status levels. */ @@ -28,20 +30,13 @@ define('VIDEO_UPLOAD_SYNC', 1); define('VIDEO_UPLOAD_SYNC_APPEND', 2); /** - * Implementation of hook_init(). - */ -function video_upload_init() { - module_load_include('inc', 'video_upload', 'video_upload_widget'); -} - -/** * Initialize the Video Upload provider. */ function video_upload_initialize_provider() { // @TODO // Providers should be configurable (only applicable once there is more // than one provider though). - require_once drupal_get_path('module', 'video_upload') . '/providers/youtube/youtube.inc'; + require_once 'providers/youtube/youtube.inc'; } /** Index: providers/youtube/zend_gdata.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/video_upload/providers/youtube/zend_gdata.inc,v retrieving revision 1.3.2.9 diff -u -p -r1.3.2.9 zend_gdata.inc --- providers/youtube/zend_gdata.inc 28 Sep 2010 19:15:56 -0000 1.3.2.9 +++ providers/youtube/zend_gdata.inc 29 Sep 2010 07:23:06 -0000 @@ -280,7 +280,7 @@ function _video_upload_gdata_set_include static $path; if (!$path) { $path = get_include_path(); - set_include_path($path . PATH_SEPARATOR . drupal_get_path('module', 'video_upload') . '/providers/youtube'); + set_include_path($path . PATH_SEPARATOR . realpath(dirname(__FILE__))); } }