Version 4.1.2

applications/cms/modules/admin/pages/pages.php

@@ -153,7 +153,7 @@ class _pages extends \IPS\Node\Controller
 		$options  = array();
 		$url['path'] = preg_replace( '#^/?(.+?)?/?$#', '\1', $url['path'] );
 		
-		$disabled = ( $url['path'] ) ? FALSE : TRUE;
+		$disabled = ( \IPS\Settings::i()->cms_use_different_gateway or $url['path'] ) ? FALSE : TRUE;
 		$dirs     = explode( '/', $url['path'] );
 		
 		if ( count( $dirs ) )
@@ -213,13 +213,21 @@ class _pages extends \IPS\Node\Controller
 			}
 		}, NULL, NULL, 'cms_root_page_url' ) );
 
+		$form->add( new \IPS\Helpers\Form\Node( 'cms_error_page', \IPS\Settings::i()->cms_error_page ? \IPS\Settings::i()->cms_error_page : 0, FALSE,array(
+			'class'           => '\IPS\cms\Pages\Page',
+			'zeroVal'         => 'cms_error_page_none',
+			'subnodes'		  => true,
+			'permissionCheck' => function( $node )
+			{
+				return $node->type == 'html';
+			}
+		) ) );
+
 		if ( $values = $form->values() )
 		{
 			$form->saveAsSettings();
 			\IPS\Member::clearCreateMenu();
-			
-			\IPS\cms\Pages\Menu::clearCaches();
-						
+									
 			/* Clear Sidebar Caches */
 			\IPS\Widget::deleteCaches();
 			
@@ -231,7 +239,7 @@ class _pages extends \IPS\Node\Controller
 		\IPS\Output::i()->title  = \IPS\Member::loggedIn()->language()->addToStack('cms_pages_settings');
 	}
 	
-		/**
+	/**
 	 * Download .htaccess file
 	 *
 	 * @return	void
@@ -344,7 +352,7 @@ FILE;
 		/* Convert to HTML */
 		foreach ( $results as $id => $result )
 		{
-			$rows[ $id ] = ( $result instanceof \IPS\cms\Pages\Page ) ? $this->_getPageRow( $result, $url ) : $this->_getFolderRow( $result, $url );
+			$rows[ $id ] = ( $result instanceof \IPS\cms\Pages\Page ) ? $this->getPageRow( $result, $url ) : $this->getFolderRow( $result, $url );
 		}
 
 		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'trees', 'core' )->rows( $rows, '' );