[pLog-svn] r4825 - plugins/branches/lifetype-1.2/templateeditor/class/action

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-02-22 15:29:20 -0500 (Thu, 22 Feb 2007)
New Revision: 4825

Modified:
   plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php
   plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php
Log:
Insert your expletive of choice here.


Modified: plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php	2007-02-22 20:22:02 UTC (rev 4824)
+++ plugins/branches/lifetype-1.2/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php	2007-02-22 20:29:20 UTC (rev 4825)
@@ -26,7 +26,7 @@
 		{
             $this->_templateId = $this->_request->getValue( "templateId" );
             $this->_newTemplateId = $this->_request->getValue( "newTemplateId" );
-            if( !$this->isValidTamplateSetName( $this->_newTemplateId ) ) {
+            if( !$this->isValidTamplateSetName( $this->_newTemplateId ) || !$this->isValidTamplateSetName( $this->_templateId )) {
                 $this->_view = new PluginBlogTemplateSetsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templateset_name"));
                 $this->setCommonData();

Modified: plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php	2007-02-22 20:22:02 UTC (rev 4824)
+++ plugins/branches/lifetype-1.2/templateeditor/class/action/pluginsitecopytemplatesetaction.class.php	2007-02-22 20:29:20 UTC (rev 4825)
@@ -25,7 +25,7 @@
 		{
             $this->_templateId = $this->_request->getValue( "templateId" );
             $this->_newTemplateId = $this->_request->getValue( "newTemplateId" );
-            if( !$this->isValidTamplateSetName( $this->_newTemplateId ) ) {
+            if( !$this->isValidTamplateSetName( $this->_newTemplateId ) || !$this->isValidTamplateSetName( $this->_templateId )) {
                 $this->_view = new PluginSiteTemplateSetsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( $this->_locale->tr("templateeditor_error_templateset_name"));
                 $this->setCommonData();