dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make Special:ChangeContentModel field labels consistently use colons"
[lhc/web/wiklou.git]
/
includes
/
profiler
/
output
/
ProfilerOutput.php
diff --git
a/includes/profiler/output/ProfilerOutput.php
b/includes/profiler/output/ProfilerOutput.php
index
fe27c04
..
bc14f4b
100644
(file)
--- a/
includes/profiler/output/ProfilerOutput.php
+++ b/
includes/profiler/output/ProfilerOutput.php
@@
-48,7
+48,7
@@
abstract class ProfilerOutput {
}
/**
}
/**
- *
Does log() just send the data to the request/script
output?
+ *
May the log() try to write to standard
output?
* @return bool
* @since 1.33
*/
* @return bool
* @since 1.33
*/
@@
-57,7
+57,10
@@
abstract class ProfilerOutput {
}
/**
}
/**
- * Log MediaWiki-style profiling data
+ * Log MediaWiki-style profiling data.
+ *
+ * For classes that enable logsToOutput(), this must not
+ * be called unless Profiler::setAllowOutput is enabled.
*
* @param array $stats Result of Profiler::getFunctionStats()
*/
*
* @param array $stats Result of Profiler::getFunctionStats()
*/