From 9d6d6519c957dd299c3216de7d3935b1452276ea Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 27 Aug 2010 15:45:46 +0000
Subject: #895344 by Berdir: Fixed Poll upgrade tests fail on SQLite.

---
 includes/database/sqlite/database.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'includes/database/sqlite')

diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc
index aa11338a9..4b7aaa620 100644
--- a/includes/database/sqlite/database.inc
+++ b/includes/database/sqlite/database.inc
@@ -113,6 +113,10 @@ class DatabaseConnection_sqlite extends DatabaseConnection {
    * SQLite compatibility implementation for the SUBSTRING_INDEX() SQL function.
    */
   public function sqlFunctionSubstringIndex($string, $delimiter, $count) {
+    // If string is empty, simply return an empty string.
+    if (empty($string)) {
+      return '';
+    }
     $end = 0;
     for ($i = 0; $i < $count; $i++) {
       $end = strpos($string, $delimiter, $end + 1);
-- 
cgit v1.2.3