- Patch #570900 by Crell: remove remnants of update_sql().

1 files changed, 0 insertions, 13 deletions

diff --git a/includes/update.inc b/includes/update.inc
index 7c50f58ff..344d250fe 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -452,12 +452,6 @@ function update_do_one($module, $number, &$context) {
       }
       $ret['results']['query'] = $function($context['sandbox']);
       $ret['results']['success'] = TRUE;
-
-      // @TODO Remove this block after all updates have been converted to
-      // return only strings.
-      if (is_array($ret['results']['query'])) {
-        $ret = $ret['results']['query'];
-      }
     }
     // @TODO We may want to do different error handling for different exception
     // types, but for now we'll just print the message.
@@ -470,13 +464,6 @@ function update_do_one($module, $number, &$context) {
     }
   }
 
-  // @TODO Remove this block after all updates have been converted to return
-  // only strings.
-  if (isset($ret['#finished'])) {
-    $context['finished'] = $ret['#finished'];
-    unset($ret['#finished']);
-  }
-
   if (isset($context['sandbox']['#finished'])) {
     $context['finished'] = $context['sandbox']['#finished'];
     unset($context['sandbox']['#finished']);