API-CHANGE sapphire folder can now be renamed.

README.md

@@ -5,13 +5,13 @@ Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstrip
 
 ## Installation ##
 
-See [installation on different platforms](http://doc.silverstripe.org/sapphire/en/installation/),
-and [installation from source](http://doc.silverstripe.org/sapphire/en/installation/from-source).
+See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
+and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
 
 ## Links ##
 
- * [Requirements](http://doc.silverstripe.org/sapphire/en/installation/server-requirements)
- * [Changelogs](http://doc.silverstripe.org/sapphire/en/changelogs/)
+ * [Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
+ * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
  * [Bugtracker](http://open.silverstripe.org)
  * [Forums](http://silverstripe.org/forums)
  * [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)

_config.php

@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Sapphire configuration file
+ * Framework configuration file
  *
- * Here you can make different settings for the Sapphire module (the core
+ * Here you can make different settings for the Framework module (the core
  * module).
  *
  * For example you can register the authentication methods you wish to use
@@ -45,7 +45,7 @@
 /**
  * The root directory of TinyMCE
  */
-define('MCE_ROOT', 'sapphire/thirdparty/tinymce/');
+define('MCE_ROOT', FRAMEWORK_DIR . '/thirdparty/tinymce/');
 
 ShortcodeParser::get('default')->register('file_link', array('File', 'link_shortcode_handler'));
 

_register_database.php

@@ -5,7 +5,7 @@
 	array(
 		'class' => 'MySQLDatabase',
 		'title' => 'MySQL 5.0+',
-		'helperPath' => 'sapphire/dev/install/MySQLDatabaseConfigurationHelper.php',
+		'helperPath' => FRAMEWORK_PATH . '/dev/install/MySQLDatabaseConfigurationHelper.php',
 		'supported' => function_exists('mysql_connect'),
 	)
 );

admin/_config.php

@@ -22,7 +22,8 @@
 
 	'use_native_selects' => true, // fancy selects are bug as of SS 2.3.0
 	'valid_elements' => "@[id|class|style|title],#a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
-	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]"
+	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]",
+	'spellchecker_rpc_url' => THIRDPARTY_DIR . '/tinymce-spellchecker/rpc.php'
 ));
 
 HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen');
@@ -34,4 +35,4 @@
 HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
 HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');
 
-CMSMenu::remove_menu_item('CMSProfileController');
+CMSMenu::remove_menu_item('CMSProfileController');

admin/code/LeftAndMain.php

@@ -209,7 +209,7 @@ function init() {
 		$htmlEditorConfig->setOption('language', i18n::get_tinymce_lang());
 		if(!$htmlEditorConfig->getOption('content_css')) {
 			$cssFiles = array();
-			$cssFiles[] = 'sapphire/admin/css/editor.css';
+			$cssFiles[] = FRAMEWORK_ADMIN_DIR . '/css/editor.css';
 
 			// Use theme from the site config
 			if(class_exists('SiteConfig') && ($config = SiteConfig::current_site_config()) && $config->Theme) {
@@ -241,32 +241,32 @@ function init() {
 			array(
 				THIRDPARTY_DIR . '/jquery/jquery.js',
 				THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js',
-				SAPPHIRE_DIR . '/javascript/jquery-ondemand/jquery.ondemand.js',
-				SAPPHIRE_DIR . '/admin/javascript/lib.js',
+				FRAMEWORK_DIR . '/javascript/jquery-ondemand/jquery.ondemand.js',
+				FRAMEWORK_ADMIN_DIR . '/javascript/lib.js',
 				THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js',
 				THIRDPARTY_DIR . '/json-js/json2.js',
 				THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js',
 				THIRDPARTY_DIR . '/jquery-cookie/jquery.cookie.js',
 				THIRDPARTY_DIR . '/jquery-query/jquery.query.js',
 				THIRDPARTY_DIR . '/jquery-form/jquery.form.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/jsizes/lib/jquery.sizes.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/jlayout/lib/jlayout.border.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/jlayout/lib/jquery.jlayout.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.adapter.jquery.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.html4.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/jsizes/lib/jquery.sizes.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/jlayout/lib/jlayout.border.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/jlayout/lib/jquery.jlayout.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.adapter.jquery.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/history-js/scripts/uncompressed/history.html4.js',
 				THIRDPARTY_DIR . '/jstree/jquery.jstree.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/chosen/chosen/chosen.jquery.js',
-				SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-hoverIntent/jquery.hoverIntent.js',
-				SAPPHIRE_ADMIN_DIR . '/javascript/jquery-changetracker/lib/jquery.changetracker.js',
-				SAPPHIRE_DIR . '/javascript/TreeDropdownField.js',
-				SAPPHIRE_DIR . '/javascript/DateField.js',
-				SAPPHIRE_DIR . '/javascript/HtmlEditorField.js',
-				SAPPHIRE_DIR . '/javascript/TabSet.js',
-				SAPPHIRE_DIR . '/javascript/i18n.js',
-				SAPPHIRE_ADMIN_DIR . '/javascript/ssui.core.js',
-				SAPPHIRE_DIR . '/javascript/GridField.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/chosen/chosen/chosen.jquery.js',
+				FRAMEWORK_ADMIN_DIR . '/thirdparty/jquery-hoverIntent/jquery.hoverIntent.js',
+				FRAMEWORK_ADMIN_DIR . '/javascript/jquery-changetracker/lib/jquery.changetracker.js',
+				FRAMEWORK_DIR . '/javascript/TreeDropdownField.js',
+				FRAMEWORK_DIR . '/javascript/DateField.js',
+				FRAMEWORK_DIR . '/javascript/HtmlEditorField.js',
+				FRAMEWORK_DIR . '/javascript/TabSet.js',
+				FRAMEWORK_DIR . '/javascript/i18n.js',
+				FRAMEWORK_ADMIN_DIR . '/javascript/ssui.core.js',
+				FRAMEWORK_DIR . '/javascript/GridField.js',
 			)
 		);
 
@@ -276,36 +276,36 @@ function init() {
 			'leftandmain.js',
 			array_unique(array_merge(
 				array(
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Panel.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Tree.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Ping.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Content.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.EditForm.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Menu.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.AddForm.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.Preview.js',
-					SAPPHIRE_ADMIN_DIR . '/javascript/LeftAndMain.BatchActions.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Panel.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Tree.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Ping.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Content.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.EditForm.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Menu.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.AddForm.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.Preview.js',
+					FRAMEWORK_ADMIN_DIR . '/javascript/LeftAndMain.BatchActions.js',
 				),
-				Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang', true, true),
-				Requirements::add_i18n_javascript(SAPPHIRE_ADMIN_DIR . '/javascript/lang', true, true)
+				Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang', true, true),
+				Requirements::add_i18n_javascript(FRAMEWORK_ADMIN_DIR . '/javascript/lang', true, true)
 			))
 		);
 
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.css');
 		Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
-		Requirements::css(SAPPHIRE_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css');
 		Requirements::css(THIRDPARTY_DIR . '/jstree/themes/apple/style.css');
-		Requirements::css(SAPPHIRE_DIR . '/css/TreeDropdownField.css');
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
-		Requirements::css(SAPPHIRE_DIR . '/css/GridField.css');
+		Requirements::css(FRAMEWORK_DIR . '/css/TreeDropdownField.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
+		Requirements::css(FRAMEWORK_DIR . '/css/GridField.css');
 
 		// Browser-specific requirements
 		$ie = isset($_SERVER['HTTP_USER_AGENT']) ? strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') : false;
 		if($ie) {
 			$version = substr($_SERVER['HTTP_USER_AGENT'], $ie + 5, 3);
-			if($version == 7) Requirements::css('sapphire/admin/css/ie7.css');
-			else if($version == 8) Requirements::css('sapphire/admin/css/ie8.css');
+			if($version == 7) Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/ie7.css');
+			else if($version == 8) Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/ie8.css');
 		}
 
 		// Custom requirements				
@@ -1078,7 +1078,7 @@ public function printable() {
 		$form->setActions(null);
 
 		Requirements::clear();
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/LeftAndMain_printable.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/LeftAndMain_printable.css');
 		return array(
 			"PrintForm" => $form
 		);
@@ -1175,11 +1175,11 @@ public function CMSVersion() {
 		if(defined('CMS_PATH') && file_exists(CMS_PATH . '/silverstripe_version')) {
 			$sapphireVersion = file_get_contents(CMS_PATH . '/silverstripe_version');
 		} else {
-			$sapphireVersion = file_get_contents(SAPPHIRE_PATH . '/silverstripe_version');
+			$sapphireVersion = file_get_contents(FRAMEWORK_PATH . '/silverstripe_version');
 		}
 		if(!$sapphireVersion) $sapphireVersion = _t('LeftAndMain.VersionUnknown', 'unknown');
 		return sprintf(
-			"sapphire: %s",
+			"SilverStripe: %s",
 			$sapphireVersion
 		);
 	}
@@ -1313,7 +1313,7 @@ function providePermissions() {
 
 	/**
 	 * Register the given javascript file as required in the CMS.
-	 * Filenames should be relative to the base, eg, SAPPHIRE_DIR . '/javascript/loader.js'
+	 * Filenames should be relative to the base, eg, FRAMEWORK_DIR . '/javascript/loader.js'
 	 */
 	public static function require_javascript($file) {
 		self::$extra_requirements['javascript'][] = array($file);

admin/code/MemberImportForm.php

@@ -57,8 +57,8 @@ function __construct($controller, $name, $fields = null, $actions = null, $valid
 
 		parent::__construct($controller, $name, $fields, $actions, $validator);
 
-		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
-		Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/MemberImportForm.js');
+		Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/MemberImportForm.js');
 
 		$this->addExtraClass('cms');
 		$this->addExtraClass('import-form');

admin/code/ModelAdmin.php

@@ -110,7 +110,7 @@ public function init() {
 			user_error('ModelAdmin::init(): Invalid Model class', E_USER_ERROR);
 		}
 
-		Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/ModelAdmin.js');
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/ModelAdmin.js');
 	}
 
 	function getEditForm($id = null, $fields = null) {

admin/code/SecurityAdmin.php

@@ -31,7 +31,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 	public function init() {
 		parent::init();
-		Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/SecurityAdmin.js');
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/SecurityAdmin.js');
 	}
 
 	public function getEditForm($id = null, $fields = null) {
@@ -133,12 +133,12 @@ public function getEditForm($id = null, $fields = null) {
 
 	public function memberimport() {
 		Requirements::clear();
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/MemberImportForm.css');
-		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
-		Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/MemberImportForm.js');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/MemberImportForm.css');
+		Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/MemberImportForm.js');
 
 		return $this->renderWith('BlankPage', array(
 			'Form' => $this->MemberImportForm()->forTemplate(),
@@ -164,12 +164,12 @@ public function MemberImportForm() {
 
 	public function groupimport() {
 		Requirements::clear();
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/screen.css');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
-		Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/MemberImportForm.css');
-		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
-		Requirements::javascript(SAPPHIRE_ADMIN_DIR . '/javascript/MemberImportForm.js');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/css/MemberImportForm.css');
+		Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/javascript/MemberImportForm.js');
 
 		return $this->renderWith('BlankPage', array(
 			'Content' => ' ',

admin/javascript/LeftAndMain.Tree.js

@@ -159,10 +159,10 @@
 					},
 					'themes': {
 						'theme': 'apple',
-						'url': 'sapphire/thirdparty/jstree/themes/apple/style.css'
+						'url': $('body').data('frameworkpath') + '/thirdparty/jstree/themes/apple/style.css'
 					},
 					// Caution: SilverStripe has disabled $.vakata.css.add_sheet() for performance reasons,
-					// which means you need to add any CSS manually to sapphire/admin/scss/_tree.css
+					// which means you need to add any CSS manually to framework/admin/scss/_tree.css
 					'plugins': [
 						'html_data', 'ui', 'dnd', 'crrm', 'themes', 
 						'checkbox' // checkboxes are hidden unless .multiple is set
@@ -338,4 +338,4 @@
 			}
 		});
 	});
-}(jQuery));
+}(jQuery));

admin/scss/_forms.scss

@@ -1,6 +1,6 @@
 /**
  * This file defines common styles for form elements used throughout the CMS interface.
- * It is an addition to the base styles defined in sapphire/css/Form.css.
+ * It is an addition to the base styles defined in framework/css/Form.css.
  *
  * @package sapphire
  * @subpackage admin
@@ -504,4 +504,4 @@ input.radio {
 
 .action-hidden {
 	display:  none;
-}
+}

admin/templates/Includes/CMSLoadingScreen.ss

@@ -1,6 +1,6 @@
 <div class="ss-loading-screen">
 	<div class="loading-logo">
-		<img class="loading-animation" src="sapphire/admin/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" />
+		<img class="loading-animation" src="$FrameworkAdminDir/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" />
 		<noscript><p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></span></p></noscript>
 	</div>
-</div>
+</div>

admin/templates/LeftAndMain.ss

@@ -7,7 +7,7 @@
 <title>$Title</title>
 </head>
 
-<body class="loading cms" lang="$Locale.RFC1766">
+<body class="loading cms" lang="$Locale.RFC1766" data-frameworkpath="$FrameworkDir">
 
 	<% include CMSLoadingScreen %>
 

admin/tests/LeftAndMainTest.php

@@ -5,7 +5,7 @@
  */
 class LeftAndMainTest extends FunctionalTest {
 
-	static $fixture_file = 'sapphire/admin/tests/LeftAndMainTest.yml';
+	static $fixture_file = 'LeftAndMainTest.yml';
 
 	protected $extraDataObjects = array('LeftAndMainTest_Object');
 

admin/tests/ModelAdminTest.php

@@ -1,7 +1,7 @@
 <?php
 
 class ModelAdminTest extends FunctionalTest {
-	static $fixture_file = 'sapphire/admin/tests/ModelAdminTest.yml';
+	static $fixture_file = 'ModelAdminTest.yml';
 
 	protected $extraDataObjects = array(
 		'ModelAdminTest_Admin',

admin/tests/SecurityAdminTest.php

@@ -5,7 +5,7 @@
  */
 class SecurityAdminTest extends FunctionalTest {
 
-	static $fixture_file = 'sapphire/admin/tests/LeftAndMainTest.yml';
+	static $fixture_file = 'LeftAndMainTest.yml';
 
 	protected $extraDataObjects = array('LeftAndMainTest_Object');
 

api/DataFormatter.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * A DataFormatter object handles transformation of data from Sapphire model objects to a particular output format, and vice versa.
+ * A DataFormatter object handles transformation of data from SilverStripe model objects to a particular output format, and vice versa.
  * This is most commonly used in developing RESTful APIs.
  * 
  * @package sapphire
@@ -297,4 +297,4 @@ public function convertStringToArray($strData) {
 		user_error('DataFormatter::convertStringToArray not implemented on subclass', E_USER_ERROR);
 	}
 
-}
+}

api/RestfulServer.php

@@ -1,10 +1,10 @@
 <?php
 /**
- * Sapphire's generic RESTful server.
+ * SilverStripe's generic RESTful server.
  * 
  * This class gives your application a RESTful API for free.  All you have to do is define static $api_access = true on
  * the appropriate DataObjects.  You will need to ensure that all of your data manipulation and security is defined in
- * your model layer (ie, the DataObject classes) and not in your Controllers.  This is the recommended design for Sapphire
+ * your model layer (ie, the DataObject classes) and not in your Controllers.  This is the recommended design for SilverStripe
  * applications.
  * 
  * Enabling restful access on a model will also enable a SOAP API, see {@link SOAPModelAccess}.