diff options
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/driver/mssql.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/mssqlnative.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/mysqli.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/postgres.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/notifications.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/style_update_p2.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/teampage.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/tools.php | 2 | 
9 files changed, 19 insertions, 19 deletions
| diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php index 50096deded..e1b41461e2 100644 --- a/phpBB/phpbb/db/driver/mssql.php +++ b/phpBB/phpbb/db/driver/mssql.php @@ -259,7 +259,7 @@ class mssql extends \phpbb\db\driver\driver  		{  			foreach ($row as $key => $value)  			{ -				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value; +				$row[$key] = ($value === ' ' || $value === null) ? '' : $value;  			}  		} diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php index aade311bcb..2eb625fb11 100644 --- a/phpBB/phpbb/db/driver/mssqlnative.php +++ b/phpBB/phpbb/db/driver/mssqlnative.php @@ -195,7 +195,7 @@ class result_mssqlnative  */  class mssqlnative extends \phpbb\db\driver\mssql_base  { -	var $m_insert_id = NULL; +	var $m_insert_id = null;  	var $last_query_text = '';  	var $query_options = array();  	var $connect_error = ''; @@ -427,7 +427,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base  		{  			foreach ($row as $key => $value)  			{ -				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value; +				$row[$key] = ($value === ' ' || $value === null) ? '' : $value;  			}  			// remove helper values from LIMIT queries diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 4d0e43b464..6144dba0c4 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -47,11 +47,11 @@ class mysqli extends \phpbb\db\driver\mysql_base  		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;  		$this->dbname = $database; -		$port = (!$port) ? NULL : $port; +		$port = (!$port) ? null : $port;  		// If port is set and it is not numeric, most likely mysqli socket is set.  		// Try to map it to the $socket parameter. -		$socket = NULL; +		$socket = null;  		if ($port)  		{  			if (is_numeric($port)) @@ -61,7 +61,7 @@ class mysqli extends \phpbb\db\driver\mysql_base  			else  			{  				$socket = $port; -				$port = NULL; +				$port = null;  			}  		} diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index 9cbb1ecb07..5cd6578d87 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -328,7 +328,7 @@ class postgres extends \phpbb\db\driver\driver  					return false;  				} -				$temp_result = @pg_fetch_assoc($temp_q_id, NULL); +				$temp_result = @pg_fetch_assoc($temp_q_id, null);  				@pg_free_result($query_id);  				return ($temp_result) ? $temp_result['last_value'] : false; @@ -456,7 +456,7 @@ class postgres extends \phpbb\db\driver\driver  					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))  					{ -						while ($row = @pg_fetch_assoc($result, NULL)) +						while ($row = @pg_fetch_assoc($result, null))  						{  							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);  						} @@ -476,7 +476,7 @@ class postgres extends \phpbb\db\driver\driver  				$endtime = $endtime[0] + $endtime[1];  				$result = @pg_query($this->db_connect_id, $query); -				while ($void = @pg_fetch_assoc($result, NULL)) +				while ($void = @pg_fetch_assoc($result, null))  				{  					// Take the time spent on parsing rows into account  				} diff --git a/phpBB/phpbb/db/migration/data/v310/notifications.php b/phpBB/phpbb/db/migration/data/v310/notifications.php index 10f1392094..61be25bb5f 100644 --- a/phpBB/phpbb/db/migration/data/v310/notifications.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications.php @@ -34,7 +34,7 @@ class notifications extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'notifications'		=> array(  					'COLUMNS'			=> array( -						'notification_id'  				=> array('UINT', NULL, 'auto_increment'), +						'notification_id'  				=> array('UINT', null, 'auto_increment'),  						'item_type'			   			=> array('VCHAR:255', ''),  						'item_id'		  				=> array('UINT', 0),  						'item_parent_id'   				=> array('UINT', 0), diff --git a/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php index 8ed626d8a6..eb2eb361ee 100644 --- a/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php +++ b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php @@ -26,7 +26,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration  			'add_tables'		=> array(  				$this->table_prefix . 'notification_types'	=> array(  					'COLUMNS'			=> array( -						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'), +						'notification_type_id'		=> array('USINT', null, 'auto_increment'),  						'notification_type_name'	=> array('VCHAR:255', ''),  						'notification_type_enabled'	=> array('BOOL', 1),  					), @@ -37,7 +37,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'notifications'		=> array(  					'COLUMNS'			=> array( -						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'), +						'notification_id'				=> array('UINT:10', null, 'auto_increment'),  						'notification_type_id'			=> array('USINT', 0),  						'item_id'						=> array('UINT', 0),  						'item_parent_id'				=> array('UINT', 0), @@ -73,7 +73,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'notifications'		=> array(  					'COLUMNS'			=> array( -						'notification_id'  				=> array('UINT', NULL, 'auto_increment'), +						'notification_id'  				=> array('UINT', null, 'auto_increment'),  						'item_type'			   			=> array('VCHAR:255', ''),  						'item_id'		  				=> array('UINT', 0),  						'item_parent_id'   				=> array('UINT', 0), diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php index 202a8409fb..c5b45d9dc9 100644 --- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php +++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php @@ -56,7 +56,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  			'add_tables'	=> array(  				$this->table_prefix . 'styles_imageset'		=> array(  					'COLUMNS'		=> array( -						'imageset_id'				=> array('UINT', NULL, 'auto_increment'), +						'imageset_id'				=> array('UINT', null, 'auto_increment'),  						'imageset_name'				=> array('VCHAR_UNI:255', ''),  						'imageset_copyright'		=> array('VCHAR_UNI', ''),  						'imageset_path'				=> array('VCHAR:100', ''), @@ -68,7 +68,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'styles_imageset_data'	=> array(  					'COLUMNS'		=> array( -						'image_id'				=> array('UINT', NULL, 'auto_increment'), +						'image_id'				=> array('UINT', null, 'auto_increment'),  						'image_name'			=> array('VCHAR:200', ''),  						'image_filename'		=> array('VCHAR:200', ''),  						'image_lang'			=> array('VCHAR:30', ''), @@ -83,7 +83,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'styles_template'		=> array(  					'COLUMNS'		=> array( -						'template_id'			=> array('UINT', NULL, 'auto_increment'), +						'template_id'			=> array('UINT', null, 'auto_increment'),  						'template_name'			=> array('VCHAR_UNI:255', ''),  						'template_copyright'	=> array('VCHAR_UNI', ''),  						'template_path'			=> array('VCHAR:100', ''), @@ -112,7 +112,7 @@ class style_update_p2 extends \phpbb\db\migration\migration  				),  				$this->table_prefix . 'styles_theme'			=> array(  					'COLUMNS'		=> array( -						'theme_id'				=> array('UINT', NULL, 'auto_increment'), +						'theme_id'				=> array('UINT', null, 'auto_increment'),  						'theme_name'			=> array('VCHAR_UNI:255', ''),  						'theme_copyright'		=> array('VCHAR_UNI', ''),  						'theme_path'			=> array('VCHAR:100', ''), diff --git a/phpBB/phpbb/db/migration/data/v310/teampage.php b/phpBB/phpbb/db/migration/data/v310/teampage.php index 80cc4be1c0..172435c672 100644 --- a/phpBB/phpbb/db/migration/data/v310/teampage.php +++ b/phpBB/phpbb/db/migration/data/v310/teampage.php @@ -27,7 +27,7 @@ class teampage extends \phpbb\db\migration\migration  			'add_tables'		=> array(  				$this->table_prefix . 'teampage'	=> array(  					'COLUMNS'		=> array( -						'teampage_id'		=> array('UINT', NULL, 'auto_increment'), +						'teampage_id'		=> array('UINT', null, 'auto_increment'),  						'group_id'			=> array('UINT', 0),  						'teampage_name'		=> array('VCHAR_UNI:255', ''),  						'teampage_position'	=> array('UINT', 0), diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 1f156fbb04..d9bd8cf568 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -33,7 +33,7 @@ class tools  	/**  	* @var object DB object  	*/ -	var $db = NULL; +	var $db = null;  	/**  	* The Column types for every database we support | 
