diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-25 20:10:16 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-25 20:10:16 +0000 |
| commit | 5a168b291edd7a299c77f5615f36531ae2fb0f0e (patch) | |
| tree | 8de4db53245d74fff3b9d9de23eebaf9f0ee7f1f /frontends/php/include | |
| parent | b6c78fc22404ded307191b277f18fbf92a169779 (diff) | |
| download | zabbix-5a168b291edd7a299c77f5615f36531ae2fb0f0e.tar.gz zabbix-5a168b291edd7a299c77f5615f36531ae2fb0f0e.tar.xz zabbix-5a168b291edd7a299c77f5615f36531ae2fb0f0e.zip | |
- [ZBX-295] fixed processing of null values under Oracle
- [ZBX-340] Oracle related fixes
- [ZBX-294,ZBX-296] Oracle related fixes
[svn merge svn://svn.zabbix.com/branches/1.4 -r5519:5522]
[svn merge svn://svn.zabbix.com/branches/1.4 -r5525:5526]
[svn merge svn://svn.zabbix.com/branches/1.4 -r5527:5529]
git-svn-id: svn://svn.zabbix.com/trunk@5533 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/classes/ctable.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/db.inc.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/frontends/php/include/classes/ctable.inc.php b/frontends/php/include/classes/ctable.inc.php index 72dc2718..cd73df1e 100644 --- a/frontends/php/include/classes/ctable.inc.php +++ b/frontends/php/include/classes/ctable.inc.php @@ -68,6 +68,8 @@ } else if(!is_null($el)){ parent::AddItem(new CCol($el)); + } else { + parent::AddItem('<td></td>'); } } } diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index fda0e808..df1fdd52 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -73,7 +73,8 @@ } break; case "ORACLE": - $DB = ocilogon($DB_USER, $DB_PASSWORD, $DB_DATABASE); + $DB = ociplogon($DB_USER, $DB_PASSWORD, $DB_DATABASE); +/* $DB = ocilogon($DB_USER, $DB_PASSWORD, $DB_DATABASE);*/ //$DB = ocilogon($DB_USER, $DB_PASSWORD, "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$DB_SERVER)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=$DB_DATABASE)))"); if(!$DB) { |