Version 5.0.13

applications/cms/sources/Blocks/Block.php

@@ -531,14 +531,18 @@ EOF;
 		$block_editor = ( isset( Request::i()->block_editor ) ) ? Request::i()->block_editor : ( $this->id ? $this->getConfig('editor') : null );
 		$block_plugin = ( isset( Request::i()->block_plugin ) ) ? Request::i()->block_plugin : ( $this->id ? $this->plugin : null );
 
+		/* Build form */
+		$form->addTab( 'content_block_form_tab__details' );
+
 		/* Double check that we didn't force the PHP blocks */
 		if( $block_editor == 'php' and !Bridge::i()->featureIsEnabled( 'phpblocks' ) )
 		{
+			/* If PHP blocks are disabled, stop here */
+			$form->addMessage( 'content_block_php_disabled', 'ipsMessage ipsMessage--warning' );
+
 			$block_editor = 'html';
 		}
-
-		/* Build form */
-		$form->addTab( 'content_block_form_tab__details' );
+		
 		$form->add( new Translatable( 'block_name', NULL, TRUE, array(
 				'app'  => 'cms',
 				'key'  => ( $this->id ? "content_block_name_" .  $this->id : NULL )
@@ -1111,7 +1115,7 @@ EOF;
 							}
 							elseif( $widget['key'] == 'Codemirror' )
 							{
-								if( isset( $widget['configuration'] ) and $widget['configuration']['content'] )
+								if( isset( $widget['configuration']['content'] ) )
 								{
 									preg_match_all( '/\{block="(.+?)"}/is', $widget['configuration']['content'], $matches );
 									foreach( $matches[1] as $blockKey )