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
APIEDIT BRANCH MERGE:
[lhc/web/wiklou.git]
/
includes
/
Profiler.php
diff --git
a/includes/Profiler.php
b/includes/Profiler.php
index
8307690
..
8e1cd14
100644
(file)
--- a/
includes/Profiler.php
+++ b/
includes/Profiler.php
@@
-40,6
+40,7
@@
if (!function_exists('memory_get_usage')) {
/**
* @todo document
/**
* @todo document
+ * @addtogroup Profiler
*/
class Profiler {
var $mStack = array (), $mWorkStack = array (), $mCollated = array ();
*/
class Profiler {
var $mStack = array (), $mWorkStack = array (), $mCollated = array ();
@@
-300,6
+301,9
@@
class Profiler {
* @static
*/
function logToDB($name, $timeSum, $eventCount) {
* @static
*/
function logToDB($name, $timeSum, $eventCount) {
+ # Do not log anything if database is readonly (bug 5375)
+ if( wfReadOnly() ) { return; }
+
# Warning: $wguname is a live patch, it should be moved to Setup.php
global $wguname, $wgProfilePerHost;
# Warning: $wguname is a live patch, it should be moved to Setup.php
global $wguname, $wgProfilePerHost;
@@
-360,4
+364,4
@@
class Profiler {
}
}
-?>
+