From d3b80490065cae77a9209eff90cb64f6f4574e08 Mon Sep 17 00:00:00 2001
From: Exile <iglix@me.com>
Date: Tue, 21 Oct 2014 17:37:35 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D1=8C=D0=B1=D0=B5,=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D0=BA=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B0=D0=BC?=
 =?UTF-8?q?,=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B0=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contributors.txt                             | 4 ++--
 upload/admin/admin_cron.php                  | 2 +-
 upload/library/includes/functions.php        | 6 +++---
 upload/library/includes/functions_upload.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

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'] ? '<img src="../images/icon_run.gif" alt="'. $lang['YES'] .'" />' : '<img src="../images/icon_delete.gif" alt="'. $lang['NO'] .'" />',
+				'CRON_ACTIVE' => $row['cron_active'] ? '<img src="../styles/images/icon_run.gif" alt="'. $lang['YES'] .'" />' : '<img src="../styles/images/icon_delete.gif" alt="'. $lang['NO'] .'" />',
 				'CRON_TITLE'  => $row['cron_title'],
 				'CRON_SCRIPT' => $row['cron_script'],
 				'SCHEDULE'    => $row['schedule'] ? $lang['SCHEDULE'][$row['schedule']] : '<b class="leech">'. $lang['NOSELECT'] .'</b>',
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 '<img src="images/icon_clip.gif" alt="" border="0" /> ';
+	return '<img src="styles/images/icon_clip.gif" alt="" border="0" /> ';
 }
 
 function transliterate ($str)
@@ -2825,10 +2825,10 @@ function is_gold ($type)
 		switch ($type)
 		{
 			case TOR_TYPE_GOLD:
-				$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
+				$is_gold = '<img src="styles/images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
 				break;
 			case TOR_TYPE_SILVER:
-				$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
+				$is_gold = '<img src="styles/images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
 				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;
 	}