Browse Source

Some small bugfixes (mostly warnings) and little improvements to the log

pull/896/head
Michael Vogel 7 years ago
parent
commit
de9a02b9ae
4 changed files with 15 additions and 5 deletions
  1. +10
    -3
      include/acl_selectors.php
  2. +1
    -1
      include/dba.php
  3. +1
    -1
      include/html2plain.php
  4. +3
    -0
      include/poller.php

+ 10
- 3
include/acl_selectors.php View File

@ -320,7 +320,14 @@ function populate_acl($user = null,$celeb = false) {
$o .= '</div>';
$o .= '</div>' . "\r\n";
$o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/
// Not totally sure what input values can come
// This is a hotfix to prevent massive php warnings
if (is_array($user) AND isset($user["uid"]))
$uid = $user["uid"];
else
$uid = intval($user);
$tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array(
'$showall'=> t("Visible to everybody"),
@ -334,8 +341,8 @@ function populate_acl($user = null,$celeb = false) {
"aclautomention"=>(feature_enabled($user,"aclautomention")?"true":"false")
),
));
return $o;
}


+ 1
- 1
include/dba.php View File

@ -99,7 +99,7 @@ class dba {
if (($duration > $a->config["system"]["db_loglimit"])) {
$duration = round($duration, 3);
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@file_put_contents($a->config["system"]["db_log"], $duration."\t".
@file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t".
basename($backtrace[1]["file"])."\t".
$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
substr($sql, 0, 2000)."\n", FILE_APPEND);


+ 1
- 1
include/html2plain.php View File

@ -218,7 +218,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
$message = html_entity_decode($message, ENT_QUOTES, 'UTF-8');
if (!$compact) {
if (!$compact AND ($message != "")) {
$counter = 1;
foreach ($urls as $id=>$url)
if (strpos($message, $url) === false)


+ 3
- 0
include/poller.php View File

@ -89,6 +89,9 @@ function poller_run(&$argv, &$argc){
// Check OStatus conversations
check_conversations();
// To-Do: Regenerate usage statistics
// q("ANALYZE TABLE `item`");
// once daily run birthday_updates and then expire in background
$d1 = get_config('system','last_expire_day');


Loading…
Cancel
Save