Changeset 1743

Timestamp:

03/06/2007 08:03:42 AM (21 months ago)

Author:

xue

Message:

Better page class error reporting.

Location:

trunk/framework

Files:

• Exceptions/messages.txt (modified) (1 diff)
• Web/Services/TPageService.php (modified) (1 diff)

trunk/framework/Exceptions/messages.txt

@@ -104 +104 @@
 pageservice_defaultpage_unchangeable    = TPageService.DefaultPage cannot be modified after the service is initialized.
 pageservice_basepath_unchangeable               = TPageService.BasePath cannot be modified after the service is initialized.
+pageservice_pageclass_invalid                   = Page class {0} is invalid. It should be TPage or extend from TPage.
 
 pageserviceconf_file_invalid                    = Unable to open page directory configuration file '{0}'.

trunk/framework/Web/Services/TPageService.php

@@ -410 +410 @@
                         if(!class_exists($className,false))
                                 include_once($path.Prado::CLASS_FILE_EXT);
-                        if(!class_exists($className,false) || !is_subclass_of($className,'TPage'))
+                        if(!class_exists($className,false))
                                 throw new TConfigurationException('pageservice_pageclass_unknown',$className);
                 }
                 else
                         $className=$this->getBasePageClass();
+
+                if($className!=='TPage' && !is_subclass_of($className,'TPage'))
+                        throw new TConfigurationException('pageservice_pageclass_invalid',$className);
 
                 $page=Prado::createComponent($className);