Fixes

class/class.core.php

@@ -1817,7 +1817,7 @@
 				//-- Если есть ложный URL указываем его
 				if ($fake_url)
 				{
-					$check_url = preg_replace('/\/(a|art)?page-\d/i', '', $check_url);
+					$check_url = preg_replace('/\/(a|art)?page-\d+/i', '', $check_url);
 
 					$_GET['doc'] = $_REQUEST['doc'] = $check_url;
 					$this->curentdoc->document_alias = $check_url;

class/class.request.php

@@ -789,7 +789,7 @@
 
 					$AVE_DB->Query("
 						UPDATE
-							" . PREFIX . "_requests
+							" . PREFIX . "_request
 						SET
 							request_changed = '" . time() . "'
 						WHERE
@@ -855,7 +855,7 @@
 
 					$AVE_DB->Query("
 						UPDATE
-							" . PREFIX . "_requests
+							" . PREFIX . "_request
 						SET
 							request_changed = '" . time() . "'
 						WHERE
@@ -923,7 +923,7 @@
 
 			$AVE_DB->Query("
 				UPDATE
-					" . PREFIX . "_requests
+					" . PREFIX . "_request
 				SET
 					request_changed = '" . time() . "'
 				WHERE

fields/doc_from_rub_search/field.php

@@ -40,7 +40,7 @@
 					$items = array_values(array_diff($items, array('')));
 				}
 
-				if(! empty($items))
+				if (! empty($items))
 				{
 					foreach($items as $k => $v)
 					{

fields/tags/field.php

@@ -196,6 +196,9 @@
 			// Делаем уникальные значения
 			$field_value = array_unique($tags);
 
+			if (empty($field_value))
+				$field_value = '';
+
 			return $field_value;
 		}
 	}
@@ -206,6 +209,13 @@
 		{
 			global $AVE_Document;
 
+			if (! $AVE_Document)
+			{
+				require_once BASE_DIR . '/class/class.docs.php';
+
+				$AVE_Document = new AVE_Document();
+			}
+
 			foreach ($data['data']['feld'] AS $_k => $_v)
 			{
 				if (array_key_exists('tags', $_v))

functions/func.watermarks.php

@@ -54,7 +54,7 @@
 	 * @param int $transparency Прозарчность
 	 * @return string link
 	 */
-	function watermarks($file, $position='center', $transparency=100)
+	function watermarks ($file, $position='center', $transparency=100)
 	{
 		global $AVE_DB;
 
@@ -76,7 +76,7 @@
 		$copyPath = $watermarkDir . '/' . trim($file_info['dirname'], '/');
 		$copyName = $imageName;
 
-		if (! file_exists($watermarkDir . $file))
+		if (file_exists($watermarkDir . $file))
 			return $file;
 
 		if (! is_dir($watermarkDir))

inc/thumb.php

@@ -14,7 +14,6 @@
 	if(! defined('BASE_DIR'))
 		define('BASE_DIR', str_replace("\\", "/", dirname(dirname(__FILE__))));
 
-
 	if (! function_exists('iptc_make_tag'))
 	{
 		function iptc_make_tag($rec, $data, $value)
@@ -78,7 +77,7 @@
 	$allowedExt = array('jpg', 'jpeg', 'png', 'gif', 'JPG', 'JPEG', 'PNG', 'GIF');
 
 	//-- Разрешенные размеры миниатюр
-	$allowedSize = (defined(THUMBNAIL_SIZES) && THUMBNAIL_SIZES != '')
+	$allowedSize = (defined('THUMBNAIL_SIZES') && THUMBNAIL_SIZES != '')
 		? explode(',', trim(THUMBNAIL_SIZES))
 		: array();