From fc6e6f62702488833da5821af4a2412a641be072 Mon Sep 17 00:00:00 2001
From: toshihiro <toshihiro>
Date: Mon, 13 Aug 2007 01:11:14 +0000
Subject: [PATCH] Modified: 1764120 - Variables View doesn't show global vars in class context

---
 .../internal/debug/core/model/PHPStackFrame.java   |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
index 43b2117..fb83c89 100644
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
@@ -266,16 +266,14 @@ public class PHPStackFrame extends PHPDebugElement implements IStackFrame, Compa
 								updateVariableList(valOld.getChildVariables(), // Update the variable list for the child variables
 										valNew.getChildVariables());
 							}
-						} else if (!valOld.getValueString().equals(
+						}
+						if (!valOld.getValueString().equals(
 								valNew.getValueString())) { 		// Has the value changed?
 							valOld.setValueString(valNew.getValueString()); // Yes, set the 'static' value (variable) to the new value
 							varOld.setValueChanged(true); 			// and set the 'has changed' flag, so that the variable view
 																	// could show the user the changed status with a different
 																	// color
 						}
-						//else {
-						//	varOld.setValueChanged (false);                                     // Reset the 'has changed' flag
-						//}
 					} catch (DebugException e) { 					// That's, because of the hasVariables method
 					}
 
@@ -343,15 +341,14 @@ public class PHPStackFrame extends PHPDebugElement implements IStackFrame, Compa
 			try {
 				if (value.hasVariables()) { 						// Does the variable/value have children
 					if (!hasRecursion(variable)) { 					// Don't follow recursive variable/values
-						variable = findVariable(value.getChildVariables(),
-								varname);
-
-						if (variable != null) {
-							return variable;
+						PHPVariable var = findVariable(value.getChildVariables(), varname);
+						if (var != null) {
+							return var;
 						}
 					}
-				} else if ((variable.getName()).equals(varname)) { 	//
-					return variable; //
+				}
+				if (variable.getName().equals(varname)) {
+					return variable;
 				}
 			} catch (DebugException e) { 							// That's, because of the hasVariables method
 			}
-- 
1.7.1