diff --git a/boot.php b/boot.php index 1364385a1b..888fb7920d 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.1016' ); +define ( 'FRIENDIKA_VERSION', '2.2.1017' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1064 ); diff --git a/mod/admin.php b/mod/admin.php index df5b6600ab..920adf05d4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -627,9 +627,9 @@ function admin_page_logs(&$a){ $seek = fseek($fp,0-$size,SEEK_END); if($seek === 0) { fgets($fp); // throw away the first partial line - $data = str_replace(array("\n","\t"),array('
','    '),escape_tags(fread($fp,$size))); + $data = escape_tags(fread($fp,$size)); while(! feof($fp)) - $data .= str_replace(array("\n","\t"),array('
','    '),escape_tags(fread($fp,4096))); + $data .= escape_tags(fread($fp,4096)); } fclose($fp); } @@ -646,7 +646,7 @@ function admin_page_logs(&$a){ // name, label, value, help string, extra data... '$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), "Must be writable by web server. Relative to your Friendika index.php."), + '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendika index.php.")), '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), )); }