From bce3afcca207c5289dbd286e4e06a00a0a8a370b Mon Sep 17 00:00:00 2001
From: Luciano Baraglia <luciano.baraglia@gmail.com>
Date: Wed, 16 Oct 2013 18:14:18 -0300
Subject: [PATCH] Module::getModule and Module::hasModule support for
 sub-modules - see #983

---
 framework/yii/base/Module.php | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/framework/yii/base/Module.php b/framework/yii/base/Module.php
index 7df87a5..a85e249 100644
--- a/framework/yii/base/Module.php
+++ b/framework/yii/base/Module.php
@@ -333,7 +333,20 @@ abstract class Module extends Component
 	 */
 	public function hasModule($id)
 	{
-		return isset($this->_modules[$id]);
+		if (strpos($id, '/') === false) {
+			return isset($this->_modules[$id]);
+		} else {
+			// it's a sub-module
+			$ids = explode('/', $id);
+			$module = $this;
+			foreach ($ids as $id) {
+				if (!isset($module->_modules[$id])) {
+					return false;
+				}
+				$module = $module->getModule($id);
+			}
+			return true;
+		}
 	}
 
 	/**
@@ -345,13 +358,23 @@ abstract class Module extends Component
 	 */
 	public function getModule($id, $load = true)
 	{
-		if (isset($this->_modules[$id])) {
-			if ($this->_modules[$id] instanceof Module) {
-				return $this->_modules[$id];
-			} elseif ($load) {
-				Yii::trace("Loading module: $id", __METHOD__);
-				return $this->_modules[$id] = Yii::createObject($this->_modules[$id], $id, $this);
+		if (strpos($id, '/') === false) {
+			if (isset($this->_modules[$id])) {
+				if ($this->_modules[$id] instanceof Module) {
+					return $this->_modules[$id];
+				} elseif ($load) {
+					Yii::trace("Loading module: $id", __METHOD__);
+					return $this->_modules[$id] = Yii::createObject($this->_modules[$id], $id, $this);
+				}
+			}
+		} else {
+			// it's a sub-module
+			$ids = explode('/', $id);
+			$module = $this;
+			foreach ($ids as $id) {
+				$module = $module->getModule($id);
 			}
+			return $module;
 		}
 		return null;
 	}