Version 4.1.19

applications/core/interface/js/js.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Return JS files
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		1 Aug 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -54,6 +54,10 @@ if ( \IPS\Request::i()->src )
 				$output .= file_get_contents( \IPS\ROOT_PATH . '/applications/' . $app . '/interface/' . implode( '/', $exploded ) ) . "\n\n\n\n";
 			}
 		}
+		elseif ( \IPS\IN_DEV && $exploded[0] == 'ckeditor' && $exploded[1] == 'ckeditor.js' )
+		{
+			$output .= file_get_contents( \IPS\ROOT_PATH . '/applications/core/dev/ckeditor/ckeditor.js' ) . "\n\n\n\n";
+		}
 		else
 		{
 			foreach ( \IPS\Output::i()->js( implode( '/', $exploded ), $app, $location ) as $url )
@@ -61,11 +65,16 @@ if ( \IPS\Request::i()->src )
 				/* If we are in_dev, ckeditor comes from the /dev/ directory instead */
 				if ( \IPS\IN_DEV && $exploded[0] == 'ckeditor' && $exploded[1] == 'ckeditor.js' )
 				{
-					$url = (string)\IPS\Http\Url::internal( "applications/core/dev/ckeditor/ckeditor.js", 'none' );
+					continue;
 				}
 		
 				try
 				{
+					/* Make sure we have a protocol defined. \IPS\Http\Url::external() does not like protocol relative URL's */
+					if ( mb_substr( $url, 0, 2 ) == '//' )
+					{
+						$url = ( \IPS\Request::i()->isSecure() ) ? 'https:' . $url : 'http:' . $url;
+					}
 					$output .= loadResource( $url );				
 				}
 				catch ( \Exception $e )