Permalink
Browse files

MINOR removed concurrent editing

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91198 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent b3d4ca3 commit 05261244b74bae5279c0998b3b75db2c351bd60b @rixth rixth committed Nov 10, 2009
Showing with 7 additions and 10 deletions.
  1. +7 −7 core/i18nTextCollector.php
  2. +0 −3 core/model/SiteTree.php
View
@@ -27,7 +27,7 @@
* @uses i18nEntityProvider
* @uses i18n
*/
-class i18nTextCollector extends Object {
+class i18nTextCollector extends BuildTask {
protected $defaultLocale;
@@ -75,13 +75,13 @@ public function run($restrictToModules = null) {
$entitiesByModule = array();
//Search for and process existent modules, or use the passed one instead
- if($restrictToModules && count($restrictToModules)) {
- foreach($restrictToModules as $restrictToModule) {
- $modules[] = basename($restrictToModule);
- }
- } else {
+ // if($restrictToModules && count($restrictToModules)) {
+ // foreach($restrictToModules as $restrictToModule) {
+ // $modules[] = basename($restrictToModule);
+ // }
+ // } else {
$modules = scandir($this->basePath);
- }
+ // }
foreach($modules as $module) {
// Only search for calls in folder with a _config.php file (which means they are modules)
View
@@ -100,15 +100,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
"ImageTracking" => "File",
"ViewerGroups" => "Group",
"EditorGroups" => "Group",
- "UsersCurrentlyEditing" => "Member",
);
static $belongs_many_many = array(
"BackLinkTracking" => "SiteTree"
);
static $many_many_extraFields = array(
- "UsersCurrentlyEditing" => array("LastPing" => "SS_Datetime"),
"LinkTracking" => array("FieldName" => "Varchar"),
"ImageTracking" => array("FieldName" => "Varchar")
);
@@ -1579,7 +1577,6 @@ function getCMSFields() {
$fields = new FieldSet(
// Add a field with a bit of metadata for concurrent editing. The fact that we're using
// non-standard attributes does not really matter, all modern UA's just ignore em.
- new LiteralField("SiteTree_Alert", '<div deletedfromstage="'.((int) $this->getIsDeletedFromStage()).'" id="SiteTree_Alert"></div>'),
new TabSet("Root",
$tabContent = new TabSet('Content',
$tabMain = new Tab('Main',

0 comments on commit 0526124

Please sign in to comment.