From c438a35ac88f131715e74a8f293dd302544b98f7 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Tue, 21 Feb 2006 18:12:09 +0000
Subject: [PATCH] fixed bug #1436058 Notices while browsing table

---
 ChangeLog                | 4 +++-
 libraries/common.lib.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 128957c2f..11192eb75 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ $Id$
 $Source$
 
 2006-02-21 Michal Čihař  <michal@cihar.com>
-    * scripts/setup.php: 
+    * scripts/setup.php:
         - Various bug fixes (bug #1435700, bug #1435806, undefined indexes).
         - XHTML fixes (patch #1435772, thanks to Matt LaPlante - cyberdog3k).
     * libraries/export/sql.php: New line before values (RFE #1435919).
@@ -34,6 +34,8 @@ $Source$
     * libraries/relation.lib.php:
       check if $cfg['Server']['pmadb'] really exists and is selectable,
       minor tweaks and formating
+    * libraries/common.lib.php PMA_getUvaCondition():
+      fixed bug #1436058 Notices while browsing table
 
 2006-02-20 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.8.0-rc1 released from QA_2_8 branch
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 1ec038df0..e7d717136 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2204,7 +2204,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
             $meta        = $fields_meta[$i];
 
             // do not use an alias in a condition
-            if (! strlen($meta->orgname)) {
+            if (! isset($meta->orgname) || ! strlen($meta->orgname)) {
                 $meta->orgname = $meta->name;
 
                 if (isset($GLOBALS['analyzed_sql'][0]['select_expr'])