From 992b602eb0a8df72cb16aba54f9522ba03f431f0 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Wed, 7 Jul 2010 15:35:18 +0000
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=B8=D0=BD=D1=82=D0=B0=D0=BA=D1=81=D0=B8?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20=D1=81=D1=83=D1=89=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B5=D0=B9=20=D0=B8=20=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 engine/classes/Engine.class.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/engine/classes/Engine.class.php b/engine/classes/Engine.class.php
index 8bd3c2ef..d999ade3 100644
--- a/engine/classes/Engine.class.php
+++ b/engine/classes/Engine.class.php
@@ -363,6 +363,15 @@ class Engine extends Object {
 	 * @return array
 	 */
 	public function GetModule($sName) {
+		/**
+		 * Поддержка полного синтаксиса при вызове метода модуля
+		 */
+		if (preg_match("/^Plugin(\w+)\_Module(\w+)\_(\w+)$/i",$sName,$aMatch)) {
+			$sName="Plugin{$aMatch[1]}_{$aMatch[2]}_{$aMatch[3]}";
+		}
+		if (preg_match("/^Module(\w+)\_(\w+)$/i",$sName,$aMatch)) {
+			$sName="{$aMatch[1]}_{$aMatch[2]}";
+		}
 		$aName=explode("_",$sName);
 		
 		if(count($aName)==2) {
@@ -455,6 +464,13 @@ class Engine extends Object {
 				break;
 			
 			case 1:		
+				/**
+				 * Поддержка полного синтаксиса при вызове сущности
+				 */
+				if (preg_match("/^Module(\w+)\_Entity(\w+)$/i",$sName,$aMatch)) {
+					$sName="{$aMatch[1]}_{$aMatch[2]}";
+				}
+				
 				list($sModule,$sEntity) = explode('_',$sName,2);
 				/**
 				 * Обслуживание короткой записи сущностей плагинов 
@@ -467,6 +483,12 @@ class Engine extends Object {
 				break;
 				
 			case 2:
+				/**
+				 * Поддержка полного синтаксиса при вызове сущности плагина
+				 */
+				if (preg_match("/^Plugin(\w+)\_Module(\w+)\_Entity(\w+)$/i",$sName,$aMatch)) {
+					$sName="Plugin{$aMatch[1]}_{$aMatch[2]}_{$aMatch[3]}";
+				}
 				/**
 				 * Entity плагина
 				 */