#992554 by greg.1.anderson: Improve drush function names for function…

…s where drush calls back in to drush

commands/core/image.drush.inc

@@ -44,7 +44,7 @@ function drush_image_flush($style_name = NULL) {
     }
     else {
       $commands = drush_get_commands();
-      return drush_redispatch($commands['image-flush'], array($style_name));
+      return drush_dispatch($commands['image-flush'], array($style_name));
     }
   }
   else {
@@ -63,4 +63,4 @@ function drush_image_flush_all() {
     image_style_flush($style);
   }
   drush_log(dt('All image styles flushed'), 'success');
-}
+}

commands/core/topic.drush.inc

@@ -68,7 +68,7 @@ function drush_topic_core_topic($topic_name = NULL) {
   if (!isset($commands[$topic_name]) && isset($commands["docs-$topic_name"])) {
     $topic_name = "docs-$topic_name";
   }
-  return drush_redispatch($commands[$topic_name]);
+  return drush_dispatch($commands[$topic_name]);
 }
 
 /**

commands/sql/sync.sql.inc

@@ -481,7 +481,7 @@ function drush_sql_post_sql_sync($source = NULL, $destination = NULL) {
     }
     if ($sanitize_query) {
       if (!drush_get_context('DRUSH_SIMULATE')) {
-        $result = drush_do_site_command($destination_settings, "sql-query", array($sanitize_query));
+        $result = drush_invoke_sitealais_args($destination_settings, "sql-query", array($sanitize_query));
       }
       else {
         drush_print("Executing on $destination: $sanitize_query");

drush.php

@@ -100,6 +100,11 @@ function drush_main() {
           // Dispatch the command(s).
           $return = drush_dispatch($command);
 
+	  // prevent a '1' at the end of the output
+	  if ($return === TRUE) {
+	    $return = '';
+	  }
+
           if (drush_get_context('DRUSH_DEBUG')) {
             drush_print_timers();
           }