[xoops-cvslog 1723] CVS update: xoops2jp/html/modules/legacyRender/class

Back to archive index

Minahito minah****@users*****
2006年 1月 14日 (土) 03:17:14 JST


Index: xoops2jp/html/modules/legacyRender/class/tplfile.php
diff -u xoops2jp/html/modules/legacyRender/class/tplfile.php:1.1.2.4 xoops2jp/html/modules/legacyRender/class/tplfile.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/class/tplfile.php:1.1.2.4	Sat Jan 14 02:58:22 2006
+++ xoops2jp/html/modules/legacyRender/class/tplfile.php	Sat Jan 14 03:17:14 2006
@@ -87,19 +87,16 @@
 	
 	function delete(&$obj, $force)
 	{
-		if (!parent::delete($obj, $force)) {
-			return false;
-		}
-		
 		$obj->loadSource();
-
-		if (!is_object($obj->Source)) {
-			return true;
-		}
-		else {
+		
+		if (is_object($obj->Source)) {
 			$handler =& xoops_getmodulehandler('tplsource');
-			return $handler->delete($obj->Source, $force);
+			if (!$handler->delete($obj->Source, $force)) {
+				return false;
+			}
 		}
+
+		return parent::delete($obj, $force);
 	}
 }
 


xoops-cvslog メーリングリストの案内
Back to archive index