Project

General

Profile

« Previous | Next » 

Revision 1928

Added by darkviper over 11 years ago

class WbDatabase fixed select_db() for multiconnection modus

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
20 Jun-2013 Build 1928 Werner v.d.Decken(DarkViper)
15
# class WbDatabase fixed select_db() in multiconnect modus
14 16
10 Jun-2013 Build 1927 Werner v.d.Decken(DarkViper)
15 17
# TranslateAdaptorWbOldStyle forgotten second arg for trim added
16 18
10 Jun-2013 Build 1926 Werner v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1927');
54
if(!defined('REVISION')) define('REVISION', '1928');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/WbDatabase.php
115 115
		}
116 116
		$this->_db_handle = @mysql_connect($hostname.$hostport,
117 117
		                                   $username,
118
		                                   $password);
118
		                                   $password,
119
		                                   true);
119 120
		if(!$this->_db_handle) {
120 121
			throw new WbDatabaseException('unable to connect \''.$scheme.'://'.
121 122
			                           $hostname.$hostport.'\'');
122 123
		} else {
123
			if(!@mysql_select_db($db_name)) {
124
			if(!@mysql_select_db($db_name, $this->_db_handle)) {
124 125
				throw new WbDatabaseException('unable to select database \''.$db_name.
125 126
				                           '\' on \''.$scheme.'://'.
126 127
				                           $hostname.$hostport.'\'');
127 128
			} else {
128 129
				if($this->sCharset) {
129
					@mysql_query('SET NAMES \''.$this->sCharset.'\'');
130
					@mysql_query('SET NAMES \''.$this->sCharset.'\'', $this->_db_handle);
130 131
				}
131 132
				$this->connected = true;
132 133
			}

Also available in: Unified diff