[geeklog-cvs] Geeklog-1.x/system/databases mssql.class.php, 1.8, 1.9

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/system/databases
In directory qs1489.pair.com:/tmp/cvs-serv977/system/databases

Modified Files:
	mssql.class.php 
Log Message:
Working MSSQL Upgrade.

Index: mssql.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/databases/mssql.class.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mssql.class.php	23 May 2008 17:25:29 -0000	1.8
--- mssql.class.php	24 May 2008 15:42:26 -0000	1.9
***************
*** 994,1006 ****
          $msg = mssql_get_last_message();
          if (trim($msg)!='') {
!             if (substr($msg, 0, 7) != 'Caution') {
                  $this->_errorlog($msg . ': ' . $msg . ". SQL in question: $sql");        
!                 if ($this->_display_error) {
!                     return  $msg . ': ' . $msg;
                  } else {
                      return 'An SQL error has occurred. Please see error.log for details.';
                  }
-             } else {
-                 $this->_errorlog('SQL Warning: "' . $msg . '" SQL in question: ' . $sql);
              }
          }
--- 994,1010 ----
          $msg = mssql_get_last_message();
          if (trim($msg)!='') {
!             if (substr($msg, 0, 7) == 'Caution') {
!                 $this->_errorlog('SQL Warning: "' . $msg . '" SQL in question: ' . $sql);
!             } else if (substr($msg, 0, 25) == 'The object was renamed to') {
!                 $this->_errorlog('Object Renamed: "' . $msg . '" SQL in question: ' . $sql);
!             } else if (substr($msg, 0, 25) == 'The COLUMN was renamed to') {
!                 $this->_errorlog('Column Renamed: "' . $msg . '" SQL in question: ' . $sql);
!             } else {
                  $this->_errorlog($msg . ': ' . $msg . ". SQL in question: $sql");        
!                 if (true ||$this->_display_error) {
!                     return  $msg . ': ' . $sql;
                  } else {
                      return 'An SQL error has occurred. Please see error.log for details.';
                  }
              }
          }