diff --git a/contributors.txt b/contributors.txt index d659e2e15..c88224b24 100644 --- a/contributors.txt +++ b/contributors.txt @@ -16,7 +16,7 @@ qaqra rserg99 leszav Dr_Brown -Bullit (http://bestrip.org/) +Bullit Triceratop (http://goldenshara.com/) Ramzess @@ -26,7 +26,7 @@ Ramzess SamSeGo alesel (http://sporttracker.kz/) -Bullit (http://bestrip.org/) +Bullit igorsaevets vasilich619 wint1000 (http://asmlocator.ru/) diff --git a/upload/admin/admin_cron.php b/upload/admin/admin_cron.php index 2f45987c6..7999137c4 100644 --- a/upload/admin/admin_cron.php +++ b/upload/admin/admin_cron.php @@ -58,7 +58,7 @@ switch ($mode) 'ROW_CLASS' => !($i % 2) ? 'row2' : 'row1', 'JOB_ID' => $i + 1, 'CRON_ID' => $row['cron_id'], - 'CRON_ACTIVE' => $row['cron_active'] ? ''. $lang['YES'] .'' : ''. $lang['NO'] .'', + 'CRON_ACTIVE' => $row['cron_active'] ? ''. $lang['YES'] .'' : ''. $lang['NO'] .'', 'CRON_TITLE' => $row['cron_title'], 'CRON_SCRIPT' => $row['cron_script'], 'SCHEDULE' => $row['schedule'] ? $lang['SCHEDULE'][$row['schedule']] : ''. $lang['NOSELECT'] .'', diff --git a/upload/library/includes/functions.php b/upload/library/includes/functions.php index f151c9cfe..16b090ce2 100644 --- a/upload/library/includes/functions.php +++ b/upload/library/includes/functions.php @@ -1963,7 +1963,7 @@ function topic_attachment_image($switch_attachment) { return ''; } - return ' '; + return ' '; } function transliterate ($str) @@ -2825,10 +2825,10 @@ function is_gold ($type) switch ($type) { case TOR_TYPE_GOLD: - $is_gold = ' '; + $is_gold = ' '; break; case TOR_TYPE_SILVER: - $is_gold = ' '; + $is_gold = ' '; break; default: $is_gold = ''; diff --git a/upload/library/includes/functions_upload.php b/upload/library/includes/functions_upload.php index a6900f00d..3fffd4e4c 100644 --- a/upload/library/includes/functions_upload.php +++ b/upload/library/includes/functions_upload.php @@ -104,12 +104,12 @@ class upload_common } } // check ext - if (!isset($this->ext_ids[$this->file_ext]) || !in_array($this->file_ext, $this->cfg['allowed_ext'], true)) + if ($uploaded_only && (!isset($this->ext_ids[$this->file_ext]) || !in_array($this->file_ext, $this->cfg['allowed_ext'], true))) { $this->errors[] = sprintf($lang['UPLOAD_ERROR_NOT_ALLOWED'], htmlCHR($this->file_ext)); return false; } - $this->file_ext_id = $this->ext_ids[$this->file_ext]; + $this->file_ext_id = @$this->ext_ids[$this->file_ext]; return true; }