[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c /tests/lang bug43958.phpt

[Dmitry Stogov]

dmitry          Tue Sep  2 09:45:49 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/tests/lang bug43958.phpt 

  Modified files:              
    /php-src/main       main.c 
  Log:
  Fixed Bug #43958 (class name added into the error message)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.32&r2=1.640.2.23.2.57.2.33&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.32 
php-src/main/main.c:1.640.2.23.2.57.2.33
--- php-src/main/main.c:1.640.2.23.2.57.2.32    Tue Aug 26 23:26:07 2008
+++ php-src/main/main.c Tue Sep  2 09:45:49 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.32 2008/08/26 23:26:07 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.33 2008/09/02 09:45:49 dmitry Exp $ */
 
 /* {{{ includes
  */
@@ -575,8 +575,8 @@
        char *docref_target = "", *docref_root = "";
        char *p;
        int buffer_len = 0;
-       char *space;
-       char *class_name = get_active_class_name(&space TSRMLS_CC);
+       char *space = "";
+       char *class_name = "";
        char *function;
        int origin_len;
        char *origin;
@@ -632,6 +632,7 @@
                        function = "Unknown";
                } else {
                        is_function = 1;
+                       class_name = get_active_class_name(&space TSRMLS_CC);
                }
        }
 

http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug43958.phpt?view=markup&rev=1.1
Index: php-src/tests/lang/bug43958.phpt
+++ php-src/tests/lang/bug43958.phpt



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php