Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed issue #811: PHP Documentation Link.

  • Loading branch information...
commit 591f59316d091dd5fecc893ca2a6dd5fc539d6e2 1 parent d74e3b9
@derickr authored
View
1  php_xdebug.h
@@ -156,7 +156,6 @@ ZEND_BEGIN_MODULE_GLOBALS(xdebug)
zend_bool show_ex_trace;
zend_bool show_local_vars;
zend_bool show_mem_delta;
- char *manual_url;
double start_time;
HashTable *active_symbol_table;
zend_execute_data *active_execute_data;
View
2  tests/error_collection_3.phpt
@@ -29,7 +29,7 @@ array(1) {
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%serror_collection_3.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%serror_collection_3.php@0'>../error_collection_3.php<b>:</b>0</a></td></tr>
-<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/trigger_error' target='_new'>trigger_error</a>
+<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/trigger_error.html' target='_new'>trigger_error</a>
( <span>&#39;An error&#39;</span>, <span>512</span> )</td><td title='%serror_collection_3.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%serror_collection_3.php@4'>../error_collection_3.php<b>:</b>4</a></td></tr>
</table></font>
"
View
2  tests/scream_html.phpt
@@ -23,6 +23,6 @@ echo @strstr(), "\n";
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sscream_html.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%sscream_html.php@0'>../scream_html.php<b>:</b>0</a></td></tr>
-<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/strstr' target='_new'>strstr</a>
+<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/strstr.html' target='_new'>strstr</a>
( )</td><td title='%sscream_html.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%sscream_html.php@4'>../scream_html.php<b>:</b>4</a></td></tr>
</table></font>
View
1  xdebug.c
@@ -242,7 +242,6 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("xdebug.default_enable", "1", PHP_INI_ALL, OnUpdateBool, default_enable, zend_xdebug_globals, xdebug_globals)
STD_PHP_INI_BOOLEAN("xdebug.extended_info", "1", PHP_INI_SYSTEM, OnUpdateBool, extended_info, zend_xdebug_globals, xdebug_globals)
STD_PHP_INI_ENTRY("xdebug.file_link_format", "", PHP_INI_ALL, OnUpdateString, file_link_format, zend_xdebug_globals, xdebug_globals)
- STD_PHP_INI_ENTRY("xdebug.manual_url", "http://www.php.net", PHP_INI_ALL, OnUpdateString, manual_url, zend_xdebug_globals, xdebug_globals)
STD_PHP_INI_ENTRY("xdebug.max_nesting_level", "100", PHP_INI_ALL, OnUpdateLong, max_nesting_level, zend_xdebug_globals, xdebug_globals)
STD_PHP_INI_BOOLEAN("xdebug.overload_var_dump", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, overload_var_dump, zend_xdebug_globals, xdebug_globals)
STD_PHP_INI_BOOLEAN("xdebug.show_exception_trace", "0", PHP_INI_ALL, OnUpdateBool, show_ex_trace, zend_xdebug_globals, xdebug_globals)
View
4 xdebug_var.c
@@ -1689,7 +1689,9 @@ char* xdebug_show_fname(xdebug_func f, int html, int flags TSRMLS_DC)
if (PG(html_errors) && EG(function_table) && zend_hash_find(EG(function_table), f.function, strlen(f.function) + 1, (void**) &zfunc) == SUCCESS) {
if (html && zfunc->type == ZEND_INTERNAL_FUNCTION) {
- return xdebug_sprintf("<a href='%s/%s' target='_new'>%s</a>\n", XG(manual_url), f.function, f.function);
+ return xdebug_sprintf("<a href='%s/%s%s' target='_new'>%s</a>\n",
+ (PG(docref_root) && PG(docref_root)[0]) ? PG(docref_root) : "http://www.php.net",
+ f.function, PG(docref_ext), f.function);
} else {
return xdstrdup(f.function);
}

0 comments on commit 591f593

Please sign in to comment.
Something went wrong with that request. Please try again.