From: bradymiller <bradymiller@users.sourceforge.net>
Date: Sun, 28 Apr 2013 06:20:03 +0000 (-0700)
Subject: Another fix to upgrade clickoptions in windows
X-Git-Tag: whats-been-changed~332
X-Git-Url: https://repo.or.cz/w/openemr.git/commitdiff_plain/899eaab1b8e1dc22e7c56cc933e3c07f724d6346

Another fix to upgrade clickoptions in windows
---

diff --git a/library/sql_upgrade_fx.php b/library/sql_upgrade_fx.php
index 0f6b7be3a..dc4262e49 100644
--- a/library/sql_upgrade_fx.php
+++ b/library/sql_upgrade_fx.php
@@ -161,8 +161,8 @@ function clickOptionsMigrate() {
       if (preg_match('/^#/', $line_of_text)) continue;
       if ($line_of_text == "") continue;
       $parts = explode('::', $line_of_text);
-      $parts[0] = trim($parts[0]);
-      $parts[1] = trim($parts[1]);
+      $parts[0] = trim(str_replace("\r\n","",$parts[0]));
+      $parts[1] = trim(str_replace("\r\n","",$parts[1]));
       if ($parts[0] != $prev) {
         $sql1 = "INSERT INTO list_options (`list_id`,`option_id`,`title`) VALUES (?,?,?)";
         SqlStatement($sql1, array('lists',$parts[0].'_issue_list',ucwords(str_replace("_"," ",$parts[0])).' Issue List') );