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

[Michael Jervis]

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

Modified Files:
	mssql.class.php 
Log Message:
More upgrade updates.

Index: mssql.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/databases/mssql.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mssql.class.php	11 May 2008 07:25:08 -0000	1.7
--- mssql.class.php	23 May 2008 17:25:29 -0000	1.8
***************
*** 992,1001 ****
      function dbError($sql='')
      {
!         if (trim(mssql_get_last_message())!='') {
!             $this->_errorlog(@mssql_get_last_message() . ': ' . @mssql_get_last_message() . ". SQL in question: $sql");        
!             if ($this->_display_error) {
!                 return  @mssql_get_last_message() . ': ' . @mssql_get_last_message();
              } else {
!                 return 'An SQL error has occurred. Please see error.log for details.';
              }
          }
--- 992,1006 ----
      function dbError($sql='')
      {
!         $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);
              }
          }