Index: imce.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imce/imce.install,v retrieving revision 1.2.2.2 diff -u -r1.2.2.2 imce.install --- imce.install 17 Apr 2008 23:38:24 -0000 1.2.2.2 +++ imce.install 20 Nov 2009 22:07:18 -0000 @@ -42,3 +42,15 @@ variable_set('imce_profiles', $profiles); return array(); } + +/** + * Make file browser tab optional in user profiles. + */ +function imce_update_6002() { + $profiles = variable_get('imce_profiles', array()); + foreach ($profiles as $id => $profile) { + $profiles[$id]['usertab'] = isset($profiles[$id]['usertab']) ? $profiles[$id]['usertab'] : 1; + } + variable_set('imce_profiles', $profiles); + return array(array('success' => TRUE, 'query' => 'File browser tab in user profiles was made optional.')); +} Index: imce.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imce/imce.module,v retrieving revision 1.23.2.5 diff -u -r1.23.2.5 imce.module --- imce.module 19 Jul 2008 13:21:02 -0000 1.23.2.5 +++ imce.module 20 Nov 2009 22:07:18 -0000 @@ -181,7 +181,7 @@ global $user; } - return $user->uid == 1 || ($account->uid == $user->uid && imce_access($user)); + return $user->uid == 1 || ($account->uid == $user->uid && ($profile = imce_user_profile($user)) && $profile['usertab']); } /** Index: inc/admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imce/inc/admin.inc,v retrieving revision 1.5.2.6 diff -u -r1.5.2.6 admin.inc --- inc/admin.inc 9 Feb 2009 18:24:36 -0000 1.5.2.6 +++ inc/admin.inc 20 Nov 2009 22:07:18 -0000 @@ -192,6 +192,11 @@ '#type' => 'markup', '#value' => imce_profile_import_html($pid), ); + $form['usertab'] = array( + '#type' => 'checkbox', + '#title' => t('Display file browser link as a tab in user profile pages.'), + '#default_value' => $profile['usertab'], + ); $form['filesize'] = array( '#type' => 'textfield', '#title' => t('Maximum file size per upload'), Index: inc/page.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imce/inc/page.inc,v retrieving revision 1.10.2.23 diff -u -r1.10.2.23 page.inc --- inc/page.inc 9 Jul 2009 19:56:54 -0000 1.10.2.23 +++ inc/page.inc 20 Nov 2009 22:07:18 -0000 @@ -4,10 +4,10 @@ /** * q = imce. */ -function imce_page() { +function imce_page($user = FALSE) { module_invoke('admin_menu', 'suppress');//suppress admin_menu $jsop = isset($_GET['jsop']) ? $_GET['jsop'] : NULL; - print theme('imce_page', imce_content($GLOBALS['user'], $jsop)); + print theme('imce_page', imce_content($user === FALSE ? $GLOBALS['user'] : $user, $jsop)); exit(); } @@ -15,9 +15,7 @@ * q = user/x/imce. */ function imce_user_page($account) { - drupal_set_title($account->name); - $jsop = isset($_GET['jsop']) ? $_GET['jsop'] : NULL; - return imce_content($account, $jsop); + return imce_page($account); } /**