contrib_needs_change.diff

diff --git a/www/includes/common.inc b/www/includes/common.inc
index 72dc525..23b34a7 100644
--- a/www/includes/common.inc
+++ b/www/includes/common.inc
@@ -946,7 +946,7 @@ function t($string, $args = array(), $langcode = NULL) {
     $string = $custom_strings[$langcode][$string];
   }
   // Translate with locale module if enabled.
-  elseif (function_exists('locale') && $langcode != 'en') {
+  elseif (function_exists('locale') && $langcode != 'en' && !empty($string) && !empty($langcode)) {
     $string = locale($string, $langcode);
   }
   if (empty($args)) {
diff --git a/www/sites/all/modules/contrib/tracelytics/modules/tracelytics_services/tracelytics_services.module b/www/sites/all/modules/contrib/tracelytics/modules/tracelytics_services/tracelytics_services.module
index 953f73c..5cc058f 100644
--- a/www/sites/all/modules/contrib/tracelytics/modules/tracelytics_services/tracelytics_services.module
+++ b/www/sites/all/modules/contrib/tracelytics/modules/tracelytics_services/tracelytics_services.module
@@ -7,7 +7,7 @@ function tracelytics_services_tracelytics_controller_alter(&$controller) {
   }
 }
 
-function tracelytics_services_services_request_preprocess_alter(&$controller, $args, $options) {
+function tracelytics_services_services_request_preprocess_alter(&$controller) {
   $endpoint_name = services_get_server_info('endpoint');
   $action = $controller['callback'];
   tracelytics_services_set_controller($endpoint_name, $action);
diff --git a/www/sites/all/modules/contrib/webform_import/webform_import.module b/www/sites/all/modules/contrib/webform_import/webform_import.module
index d424dbb..ce5bbe5 100644
--- a/www/sites/all/modules/contrib/webform_import/webform_import.module
+++ b/www/sites/all/modules/contrib/webform_import/webform_import.module
@@ -247,11 +247,12 @@ function webform_import_form(&$form_state, $node) {
   );
 
   $users_list = array();
-  $result = db_query('SELECT uid, name FROM {users}');
-  while ($row = db_fetch_object($result)) {
-    if($row->uid == 0){ $row->name = "Anonymous";}
-    $users_list[$row->uid] = $row->name;
-  }
+  #$result = db_query('SELECT uid, name FROM {users}');
+  #while ($row = db_fetch_object($result)) {
+    #if($row->uid == 0){ $row->name = "Anonymous";}
+    #$users_list[$row->uid] = $row->name;
+  #}
+  $users_list[0] = 'Anonymous';
 
   $form['default_user'] = array(
     '#type' => 'select',