tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 22:28:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR removed concurrent editing (merged from r91198)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91204 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-10 21:35:43 +00:00 committed by Sam Minnee
parent 88a8c04d9b
commit 654af798ee
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/i18nTextCollector.php
View File

@ -27,7 +27,7 @@
* @uses i18nEntityProvider
* @uses i18n
*/
class i18nTextCollector extends Object {
class i18nTextCollector extends BuildTask {
protected $defaultLocale;
@ -75,13 +75,13 @@ class i18nTextCollector extends Object {
$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)

3
core/model/SiteTree.php
View File

@ -100,7 +100,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
"ImageTracking" => "File",
"ViewerGroups" => "Group",
"EditorGroups" => "Group",
"UsersCurrentlyEditing" => "Member",
);
static $belongs_many_many = array(
@ -108,7 +107,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
);
static $many_many_extraFields = array(
"UsersCurrentlyEditing" => array("LastPing" => "SS_Datetime"),
"LinkTracking" => array("FieldName" => "Varchar"),
"ImageTracking" => array("FieldName" => "Varchar")
);
@ -1579,7 +1577,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$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',