From: krakjoe <joe.watkins@live.co.uk>
Date: Wed, 13 Nov 2013 14:50:13 +0000 (+0000)
Subject: show conditionals
X-Git-Tag: php-5.6.0alpha1~110^2~363
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6d45107b23c737fae01b71d30aff84716666124;p=php

show conditionals
---

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index d4af16586f..a3d95d4a22 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -698,12 +698,13 @@ zend_vm_enter:
     }\
 } while(!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING))
 
-        phpdbg_print_opline(
-		    execute_data, 0 TSRMLS_CC);
-
         /* allow conditional breakpoints to access the vm uninterrupted */
         if (!(PHPDBG_G(flags) & PHPDBG_IN_COND_BP)) {
             
+            /* not while in conditionals */
+            phpdbg_print_opline(
+		        execute_data, 0 TSRMLS_CC);
+            
             /* conditions cannot be executed by eval()'d code */
             if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL) 
                 && (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP)
diff --git a/tutorials/show-conditionals.png b/tutorials/show-conditionals.png
new file mode 100644
index 0000000000..1decbcc421
Binary files /dev/null and b/tutorials/show-conditionals.png differ