From 0bcb57dfb5d0cdd81cd4fbcdce1d2a4f8a28835e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 25 Mar 2011 16:48:22 +1300 Subject: [PATCH] MINOR Fixed merge errors (copied from 31d7a00eb785b9a570b33994dfdec82b930db236) --- code/SiteTree.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/SiteTree.php b/code/SiteTree.php index 64e8b66b..30bfb95b 100755 --- a/code/SiteTree.php +++ b/code/SiteTree.php @@ -1674,12 +1674,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid */ function getCMSFields() { require_once("forms/Form.php"); - Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); - Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); - Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js"); - Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); - Requirements::javascript(SAPPHIRE_DIR . '/javascript/UpdateURL.js'); - // Status / message // Create a status message for multiple parents if($this->ID && is_numeric($this->ID)) {