OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-03-24 15:55:24 +01:00
parent f5a9c825ef ce34805ee7
commit 0afbd552ab
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/lib/clicompatbase.inc.php
View File

@@ -415,8 +415,11 @@
$cSqlExecution->stop();
if ($cSqlExecution->diff() > $sql_warntime)
sql_warn('execution took ' . $cSqlExecution->diff() . ' seconds');
if ($sql_warntime>0 && $cSqlExecution->diff() > $sql_warntime)
{
$ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n" . $_SERVER['HTTP_USER_AGENT'] : "";
sql_warn("execution took " . $cSqlExecution->diff() . " seconds" . $ua);
}
}
return $result;
@@ -495,7 +498,7 @@
$email_content .= "\n--------------------\n";
$email_content .= print_r(debug_backtrace(), true);
//mb_send_mail($sql_errormail, 'sql_warn: ' . $absolute_server_URI, $email_content, $emailheaders);
@mb_send_mail($sql_errormail, 'sql_warn: ' . $absolute_server_URI, $email_content, $emailheaders);
}
/*

5
htdocs/lib2/db.inc.php
View File

@@ -326,7 +326,10 @@
$cSqlExecution->stop();
if ($cSqlExecution->diff() > $opt['db']['warn']['time'])
sql_warn('execution took ' . $cSqlExecution->diff() . ' seconds');
{
$ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n" . $_SERVER['HTTP_USER_AGENT'] : "";
sql_warn("execution took " . $cSqlExecution->diff() . " seconds" . $ua);
}
}
}

1
htdocs/resource2/ocstyle/css/style_screen.css
View File

@@ -1420,3 +1420,4 @@ div#havefound {
.quoteheader, .topslice_quote, .bbc_standard_quote { display:none; }
#forum div.rsstext {margin: 0px 30px 0.5em 0px; padding: 0px; line-height: 1.3em; font-family: arial, sans serif; font-size: 12px; }
.quoteheader, .topslice_quote, .bbc_standard_quote { display:none; }
#forum div.rsstext img {max-width:200px; max-height:120px;}