'
@@ -250,7 +250,7 @@ class VirtualPage extends Page {
return $fields;
}
- /**
+ /**
* We have to change it to copy all the content from the original page first.
*/
public function onBeforeWrite() {
@@ -303,7 +303,7 @@ class VirtualPage extends Page {
if(!$this->extension_instances['Versioned']->migratingVersion) {
if(
$this->isChanged('CopyContentFromID')
- && $this->CopyContentFromID != 0
+ && $this->CopyContentFromID != 0
&& $this instanceof VirtualPage
) {
$this->updateImageTracking();
@@ -352,8 +352,8 @@ class VirtualPage extends Page {
if(!$orig->stat('can_be_root') && !$this->ParentID) {
$result->error(
_t(
- 'VirtualPage.PageTypNotAllowedOnRoot',
- 'Original page type "{type}" is not allowed on the root level for this virtual page',
+ 'VirtualPage.PageTypNotAllowedOnRoot',
+ 'Original page type "{type}" is not allowed on the root level for this virtual page',
array('type' => $orig->i18n_singular_name())
),
'CAN_BE_ROOT_VIRTUAL'
@@ -407,7 +407,7 @@ class VirtualPage extends Page {
* Allow attributes on the master page to pass
* through to the virtual page
*
- * @param string $field
+ * @param string $field
* @return mixed
*/
public function __get($field) {
@@ -423,7 +423,7 @@ class VirtualPage extends Page {
/**
* Pass unrecognized method calls on to the original data object
*
- * @param string $method
+ * @param string $method
* @param string $args
* @return mixed
*/
@@ -441,8 +441,8 @@ class VirtualPage extends Page {
*/
public function hasField($field) {
return (
- array_key_exists($field, $this->record)
- || $this->hasDatabaseField($field)
+ array_key_exists($field, $this->record)
+ || $this->hasDatabaseField($field)
|| array_key_exists($field, $this->db()) // Needed for composite fields
|| parent::hasMethod("get{$field}")
|| $this->CopyContentFrom()->hasField($field)
@@ -451,8 +451,8 @@ class VirtualPage extends Page {
/**
* Overwrite to also check for method on the original data object
*
- * @param string $method
- * @return bool
+ * @param string $method
+ * @return bool
*/
public function hasMethod($method) {
if(parent::hasMethod($method)) return true;
@@ -533,8 +533,8 @@ class VirtualPage_Controller extends Page_Controller {
/**
* Also check the original object's original controller for the method
*
- * @param string $method
- * @return bool
+ * @param string $method
+ * @return bool
*/
public function hasMethod($method) {
$haveIt = parent::hasMethod($method);
@@ -551,7 +551,7 @@ class VirtualPage_Controller extends Page_Controller {
/**
* Pass unrecognized method calls on to the original controller
*
- * @param string $method
+ * @param string $method
* @param string $args
* @return mixed
*
diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php
index 4ef1511c..e86f2432 100644
--- a/code/reports/BrokenLinksReport.php
+++ b/code/reports/BrokenLinksReport.php
@@ -128,8 +128,8 @@ class BrokenLinksReport extends SS_Report {
'Draft' => _t('BrokenLinksReport.CheckSiteDropdownDraft', 'Draft Site')
)),
new DropdownField(
- 'Reason',
- _t('BrokenLinksReport.ReasonDropdown', 'Problem to check'),
+ 'Reason',
+ _t('BrokenLinksReport.ReasonDropdown', 'Problem to check'),
array(
'' => _t('BrokenLinksReport.Any', 'Any'),
'BROKENFILE' => _t('BrokenLinksReport.ReasonDropdownBROKENFILE', 'Broken file'),
diff --git a/code/search/SearchForm.php b/code/search/SearchForm.php
index cbf46012..1e775b62 100644
--- a/code/search/SearchForm.php
+++ b/code/search/SearchForm.php
@@ -1,13 +1,13 @@
*/
@@ -84,7 +84,7 @@ class SearchForm extends Form {
/**
* Set the classes to search.
- * Currently you can only choose from "SiteTree" and "File", but a future version might improve this.
+ * Currently you can only choose from "SiteTree" and "File", but a future version might improve this.
*/
public function classesToSearch($classes) {
$illegalClasses = array_diff($classes, array('SiteTree', 'File'));
@@ -101,13 +101,13 @@ class SearchForm extends Form {
* @return array
*/
public function getClassesToSearch() {
- return $this->classesToSearch;
+ return $this->classesToSearch;
}
/**
* Return dataObjectSet of the results using $_REQUEST to get info from form.
* Wraps around {@link searchEngine()}.
- *
+ *
* @param int $pageLength DEPRECATED 2.3 Use SearchForm->pageLength
* @param array $data Request data as an associative array. Should contain at least a key 'Search' with all searched keywords.
* @return SS_List
@@ -193,7 +193,7 @@ class SearchForm extends Form {
/**
* Get the search query for display in a "You searched for ..." sentence.
- *
+ *
* @param array $data
* @return string
*/
@@ -207,7 +207,7 @@ class SearchForm extends Form {
/**
* Set the maximum number of records shown on each page.
- *
+ *
* @param int $length
*/
public function setPageLength($length) {
diff --git a/css/_old/AssetAdmin.css b/css/_old/AssetAdmin.css
index c638adb2..540c1813 100644
--- a/css/_old/AssetAdmin.css
+++ b/css/_old/AssetAdmin.css
@@ -4,7 +4,7 @@
#right form #deletemarked .middleColumn {
background: none;
}
-.dragfile,
+.dragfile,
.dragfile img {
float: left;
cursor: move;
@@ -38,4 +38,4 @@ form#Form_AddForm .field span.readonly {
/* Same as .checkboxAboveTree */
border-top: 1px solid #CCCCCC;
padding: .5em;
-}
\ No newline at end of file
+}
diff --git a/css/_old/CMSMain.css b/css/_old/CMSMain.css
index e59b97e0..33b7827d 100644
--- a/css/_old/CMSMain.css
+++ b/css/_old/CMSMain.css
@@ -1,3 +1,3 @@
div#SideReportsHolder {
clear: left;
-}
\ No newline at end of file
+}
diff --git a/css/_old/CommentAdmin.css b/css/_old/CommentAdmin.css
index 4060f6d0..31e69d66 100644
--- a/css/_old/CommentAdmin.css
+++ b/css/_old/CommentAdmin.css
@@ -41,4 +41,4 @@ included in the template due to a bug since 29/09/08 (r63175), and we can't find
font-size: 80%;
font-style: italic;
}
-*/
\ No newline at end of file
+*/
diff --git a/javascript/AssetAdmin.DragDrop.js b/javascript/AssetAdmin.DragDrop.js
index d031574c..e4c4a488 100644
--- a/javascript/AssetAdmin.DragDrop.js
+++ b/javascript/AssetAdmin.DragDrop.js
@@ -25,7 +25,7 @@
},
/**
* Function: drop
- *
+ *
* Take selected files and move them to a folder target in the tree.
*/
drop: function(e, ui) {
@@ -44,10 +44,10 @@
/**
* Function: getSelected
- *
+ *
* Get the IDs of all selected files in the table.
* Used for drag'n'drop.
- *
+ *
* Returns:
* Array
*/
@@ -69,8 +69,8 @@
appendTo: 'body',
helper: function() {
return $(
- '
' +
- ss.i18n.sprintf(ss.i18n._t('AssetTableField.MOVING'),container.getSelected().length) +
+ '
'
+ ss.i18n.sprintf(ss.i18n._t('AssetTableField.MOVING'),container.getSelected().length)
'
'
);
}
@@ -83,10 +83,10 @@
},
/**
* Function: onmousedown
- *
+ *
* Parameters:
* (Event) e
- *
+ *
* Automatically select the checkbox in the same table row
* to signify that this element is moved, and hint that
* all checkboxed elements will be moved along with it.
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 16bb8deb..10eb91fd 100644
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -11,7 +11,7 @@
$(document).ready(function() {
$('#Form_BatchActionsForm').entwine('.ss.tree').register(
// TODO Hardcoding of base URL
- 'admin/assets/batchactions/delete',
+ 'admin/assets/batchactions/delete',
function(ids) {
var confirmed = confirm(
ss.i18n.sprintf(
@@ -55,7 +55,7 @@
msg = ss.i18n._t('AssetAdmin.ConfirmDelete');
} else {
msg = ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE');
- }
+ }
if(!confirm(msg)) return false;
this.getGridField().reload({data: [{name: this.attr('name'), value: this.val()}]});
@@ -94,7 +94,7 @@
/**
* Function: onsubmit
- *
+ *
* Parameters:
* (Event) e
*/
diff --git a/javascript/CMSMain.AddForm.js b/javascript/CMSMain.AddForm.js
index 778b9483..d242a4dd 100644
--- a/javascript/CMSMain.AddForm.js
+++ b/javascript/CMSMain.AddForm.js
@@ -44,7 +44,7 @@
* Similar implementation to LeftAndMain.Tree.js.
*/
updateTypeList: function() {
- var hints = this.data('hints'),
+ var hints = this.data('hints'),
parentTree = this.find('#Form_AddForm_ParentID_Holder .TreeDropdownField'),
parentMode = this.find("input[name=ParentModeField]:checked").val(),
metadata = parentTree.data('metadata'),
@@ -101,7 +101,7 @@
},
/**
* Update the selection filter with the given blacklist and default selection
- *
+ *
* @param array disallowedChildren
* @param string defaultChildClass
*/
@@ -109,7 +109,7 @@
// Limit selection
var allAllowed = null; // troolian
this.find('#Form_AddForm_PageType li').each(function() {
- var className = $(this).find('input').val(),
+ var className = $(this).find('input').val(),
isAllowed = ($.inArray(className, disallowedChildren) === -1);
$(this).setEnabled(isAllowed);
diff --git a/javascript/CMSMain.EditForm.js b/javascript/CMSMain.EditForm.js
index 17806362..3d92f5f3 100644
--- a/javascript/CMSMain.EditForm.js
+++ b/javascript/CMSMain.EditForm.js
@@ -17,7 +17,7 @@
/**
* Class: .cms-edit-form input[name=Title]
- *
+ *
* Input validation on the Title field
*/
$('.cms-edit-form input[name=Title]').entwine({
@@ -61,7 +61,7 @@
/**
* Function: updateRelatedFields
- *
+ *
* Update the related fields if appropriate
* (String) title The new title
* (Stirng) origTitle The original title
@@ -80,7 +80,7 @@
/**
* Function: updateURLSegment
- *
+ *
* Update the URLSegment
* (String) title
*/
@@ -96,7 +96,7 @@
/**
* Function: updateBreadcrumbLabel
- *
+ *
* Update the breadcrumb
* (String) title
*/
@@ -110,9 +110,9 @@
/**
* Function: _addActions
- *
+ *
* Utility to add update from title action
- *
+ *
*/
_addActions: function() {
var self = this;
@@ -137,7 +137,7 @@
/**
* Class: .cms-edit-form .parentTypeSelector
- *
+ *
* ParentID field combination - mostly toggling between
* the two radiobuttons and setting the hidden "ParentID" field
*/
@@ -159,7 +159,7 @@
/**
* Function: _toggleSelection
- *
+ *
* Parameters:
* (Event) e
*/
@@ -175,7 +175,7 @@
/**
* Function: _changeParentId
- *
+ *
* Parameters:
* (Event) e
*/
@@ -188,7 +188,7 @@
/**
* Class: .cms-edit-form #CanViewType, .cms-edit-form #CanEditType
- *
+ *
* Toggle display of group dropdown in "access" tab,
* based on selection of radiobuttons.
*/
@@ -226,20 +226,20 @@
/**
* Class: .cms-edit-form .Actions #Form_EditForm_action_print
- *
+ *
* Open a printable representation of the form in a new window.
* Used for readonly older versions of a specific page.
*/
$('.cms-edit-form .Actions #Form_EditForm_action_print').entwine({
/**
* Function: onclick
- *
+ *
* Parameters:
* (Event) e
*/
onclick: function(e) {
- var printURL = $(this[0].form).attr('action').replace(/\?.*$/,'')
- + '/printable/'
+ var printURL = $(this[0].form).attr('action').replace(/\?.*$/,'')
+ + '/printable/'
+ $(':input[name=ID]',this[0].form).val();
if(printURL.substr(0,7) != 'http://') printURL = $('base').attr('href') + printURL;
@@ -251,14 +251,14 @@
/**
* Class: .cms-edit-form .Actions #Form_EditForm_action_rollback
- *
+ *
* A "rollback" to a specific version needs user confirmation.
*/
$('.cms-edit-form .Actions #Form_EditForm_action_rollback').entwine({
/**
* Function: onclick
- *
+ *
* Parameters:
* (Event) e
*/
@@ -266,7 +266,7 @@
var form = this.parents('form:first'), version = form.find(':input[name=Version]').val(), message = '';
if(version) {
message = ss.i18n.sprintf(
- ss.i18n._t('CMSMain.RollbackToVersion'),
+ ss.i18n._t('CMSMain.RollbackToVersion'),
version
);
} else {
@@ -282,21 +282,21 @@
/**
* Class: .cms-edit-form .Actions #Form_EditForm_action_archive
- *
+ *
* Informing the user about the archive action while requiring confirmation
*/
$('.cms-edit-form .Actions #Form_EditForm_action_archive').entwine({
/**
* Function: onclick
- *
+ *
* Parameters:
* (Event) e
*/
onclick: function(e) {
var form = this.parents('form:first'), version = form.find(':input[name=Version]').val(), message = '';
message = ss.i18n.sprintf(
- ss.i18n._t('CMSMain.Archive'),
+ ss.i18n._t('CMSMain.Archive'),
version
);
if(confirm(message)) {
@@ -309,14 +309,14 @@
/**
* Class: .cms-edit-form .Actions #Form_EditForm_action_restore
- *
+ *
* Informing the user about the archive action while requiring confirmation
*/
$('.cms-edit-form .Actions #Form_EditForm_action_restore').entwine({
/**
* Function: onclick
- *
+ *
* Parameters:
* (Event) e
*/
@@ -326,7 +326,7 @@
message = '',
toRoot = this.data('toRoot');
message = ss.i18n.sprintf(
- ss.i18n._t(toRoot ? 'CMSMain.RestoreToRoot' : 'CMSMain.Restore'),
+ ss.i18n._t(toRoot ? 'CMSMain.RestoreToRoot' : 'CMSMain.Restore'),
version
);
if(confirm(message)) {
@@ -339,21 +339,21 @@
/**
* Class: .cms-edit-form .Actions #Form_EditForm_action_delete
- *
+ *
* Informing the user about the delete from draft action while requiring confirmation
*/
$('.cms-edit-form .Actions #Form_EditForm_action_delete').entwine({
/**
* Function: onclick
- *
+ *
* Parameters:
* (Event) e
*/
onclick: function(e) {
var form = this.parents('form:first'), version = form.find(':input[name=Version]').val(), message = '';
message = ss.i18n.sprintf(
- ss.i18n._t('CMSMain.DeleteFromDraft'),
+ ss.i18n._t('CMSMain.DeleteFromDraft'),
version
);
if(confirm(message)) {
@@ -372,14 +372,14 @@
/**
* Function: onclick
- *
+ *
* Parameters:
* (Event) e
*/
onclick: function(e) {
var form = this.parents('form:first'), version = form.find(':input[name=Version]').val(), message = '';
message = ss.i18n.sprintf(
- ss.i18n._t('CMSMain.Unpublish'),
+ ss.i18n._t('CMSMain.Unpublish'),
version
);
if(confirm(message)) {
diff --git a/javascript/CMSPageHistoryController.js b/javascript/CMSPageHistoryController.js
index 682af966..20ee1699 100644
--- a/javascript/CMSPageHistoryController.js
+++ b/javascript/CMSPageHistoryController.js
@@ -1,8 +1,8 @@
(function($) {
/**
* File: CMSPageHistoryController.js
- *
- * Handles related interactions between the version selection form on the
+ *
+ * Handles related interactions between the version selection form on the
* left hand side of the panel and the version displaying on the right
* hand side.
*/
@@ -32,7 +32,7 @@
* display based on whether we have two or 1 option selected
*
* Todo:
- * Handle coupling to admin url
+ * Handle coupling to admin url
*/
onsubmit: function(e, d) {
e.preventDefault();
@@ -116,7 +116,7 @@
* Selects or deselects the row (if in compare mode). Will trigger
* an update of the edit form if either selected (in single mode)
* or if this is the second row selected (in compare mode)
- */
+ */
onclick: function(e) {
var compare, selected;
@@ -153,9 +153,9 @@
},
/**
- * Function: _unselect()
+ * Function: _unselect()
*
- * Unselects the row from the form selection.
+ * Unselects the row from the form selection.
*/
_unselect: function() {
this.removeClass('active');
diff --git a/javascript/SiteTreeURLSegmentField.js b/javascript/SiteTreeURLSegmentField.js
index 59116aff..b2003fca 100644
--- a/javascript/SiteTreeURLSegmentField.js
+++ b/javascript/SiteTreeURLSegmentField.js
@@ -23,7 +23,7 @@
},
redraw: function() {
- var field = this.find(':text'),
+ var field = this.find(':text'),
url = decodeURI(field.data('prefix') + field.val()),
previewUrl = url;
@@ -87,7 +87,7 @@
/**
* Return a value matching the criteria.
- *
+ *
* @param (String)
* @param (Function)
*/
diff --git a/javascript/lang/ar.js b/javascript/lang/ar.js
index bd585f32..de9964e2 100644
--- a/javascript/lang/ar.js
+++ b/javascript/lang/ar.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "إلغاء",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/cs.js b/javascript/lang/cs.js
index 8943c917..64c3c0a7 100644
--- a/javascript/lang/cs.js
+++ b/javascript/lang/cs.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Storno",
"URLSEGMENT.UpdateURL": "Aktualizovat URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/de.js b/javascript/lang/de.js
index 9556e382..75101cc9 100644
--- a/javascript/lang/de.js
+++ b/javascript/lang/de.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Abbrechen",
"URLSEGMENT.UpdateURL": "URL aktualisieren"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/el.js b/javascript/lang/el.js
index 2c5cdd3e..b38301d2 100644
--- a/javascript/lang/el.js
+++ b/javascript/lang/el.js
@@ -42,4 +42,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Άκυρο"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/en.js b/javascript/lang/en.js
index 95775885..8ca91f98 100644
--- a/javascript/lang/en.js
+++ b/javascript/lang/en.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Cancel",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/eo.js b/javascript/lang/eo.js
index 927dbf2d..91750f85 100644
--- a/javascript/lang/eo.js
+++ b/javascript/lang/eo.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Rezigni",
"URLSEGMENT.UpdateURL": "Ĝisdatigi je URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/es.js b/javascript/lang/es.js
index ddbc9f7f..99030e73 100644
--- a/javascript/lang/es.js
+++ b/javascript/lang/es.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Cancelar",
"URLSEGMENT.UpdateURL": "Actualizar URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/fa_IR.js b/javascript/lang/fa_IR.js
index 0d486250..8bf52d06 100644
--- a/javascript/lang/fa_IR.js
+++ b/javascript/lang/fa_IR.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "لغو",
"URLSEGMENT.UpdateURL": "به روز رسانی URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/fi.js b/javascript/lang/fi.js
index 8a97e3b3..b55536a7 100644
--- a/javascript/lang/fi.js
+++ b/javascript/lang/fi.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Peruuta",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/fr.js b/javascript/lang/fr.js
index 884e67c7..94acc497 100644
--- a/javascript/lang/fr.js
+++ b/javascript/lang/fr.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Annuler",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/hu.js b/javascript/lang/hu.js
index f829e178..661ea80b 100644
--- a/javascript/lang/hu.js
+++ b/javascript/lang/hu.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Mégsem",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/id.js b/javascript/lang/id.js
index 6ad98095..319a0044 100644
--- a/javascript/lang/id.js
+++ b/javascript/lang/id.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Batal",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/is.js b/javascript/lang/is.js
index 8c200dd7..039afd93 100644
--- a/javascript/lang/is.js
+++ b/javascript/lang/is.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Hætta við",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/it.js b/javascript/lang/it.js
index 71892b0a..b0b7811c 100644
--- a/javascript/lang/it.js
+++ b/javascript/lang/it.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Annulla",
"URLSEGMENT.UpdateURL": "Aggiornare l'URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/ja.js b/javascript/lang/ja.js
index f6e902cc..a4adb3b4 100644
--- a/javascript/lang/ja.js
+++ b/javascript/lang/ja.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "キャンセル",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/ko.js b/javascript/lang/ko.js
index 6744dcf9..08412d91 100644
--- a/javascript/lang/ko.js
+++ b/javascript/lang/ko.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "취소",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/lt.js b/javascript/lang/lt.js
index 1f9a8593..5ff655cb 100644
--- a/javascript/lang/lt.js
+++ b/javascript/lang/lt.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Atšaukti",
"URLSEGMENT.UpdateURL": "Atnaujinti URL dalį"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/mi.js b/javascript/lang/mi.js
index 2d4c4596..bbe4adc6 100644
--- a/javascript/lang/mi.js
+++ b/javascript/lang/mi.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Whakakore",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/nb.js b/javascript/lang/nb.js
index 85356e4b..6d101db1 100644
--- a/javascript/lang/nb.js
+++ b/javascript/lang/nb.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Avbryt",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/nl.js b/javascript/lang/nl.js
index 35953650..ef8cd3da 100644
--- a/javascript/lang/nl.js
+++ b/javascript/lang/nl.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Annuleren",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/pl.js b/javascript/lang/pl.js
index ff73ac7a..655e3870 100644
--- a/javascript/lang/pl.js
+++ b/javascript/lang/pl.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Anuluj",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/ro.js b/javascript/lang/ro.js
index e989ba61..3e4e1357 100644
--- a/javascript/lang/ro.js
+++ b/javascript/lang/ro.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Renunţare",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/ru.js b/javascript/lang/ru.js
index 64db8be5..526e4eea 100644
--- a/javascript/lang/ru.js
+++ b/javascript/lang/ru.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Отмена",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/sk.js b/javascript/lang/sk.js
index 9267c336..289e63d0 100644
--- a/javascript/lang/sk.js
+++ b/javascript/lang/sk.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Zrušiť",
"URLSEGMENT.UpdateURL": "Aktualizovať URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/sl.js b/javascript/lang/sl.js
index 1a3ff5ec..b0987333 100644
--- a/javascript/lang/sl.js
+++ b/javascript/lang/sl.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Prekliči",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/sr.js b/javascript/lang/sr.js
index fe92935b..48216ab1 100644
--- a/javascript/lang/sr.js
+++ b/javascript/lang/sr.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Одустани",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/sr_RS@latin.js b/javascript/lang/sr_RS@latin.js
index 343859e2..94cba569 100644
--- a/javascript/lang/sr_RS@latin.js
+++ b/javascript/lang/sr_RS@latin.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Odustani",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/ar.js b/javascript/lang/src/ar.js
index 70fcaacc..49d7900e 100644
--- a/javascript/lang/src/ar.js
+++ b/javascript/lang/src/ar.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "موافق",
"URLSEGMENT.Cancel": "إلغاء",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/cs.js b/javascript/lang/src/cs.js
index 59926f38..a468b411 100644
--- a/javascript/lang/src/cs.js
+++ b/javascript/lang/src/cs.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Storno",
"URLSEGMENT.UpdateURL": "Aktualizovat URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/de.js b/javascript/lang/src/de.js
index fb27ca9d..a77e6043 100644
--- a/javascript/lang/src/de.js
+++ b/javascript/lang/src/de.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Abbrechen",
"URLSEGMENT.UpdateURL": "URL aktualisieren"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/el.js b/javascript/lang/src/el.js
index 3facc175..acc0947d 100644
--- a/javascript/lang/src/el.js
+++ b/javascript/lang/src/el.js
@@ -36,4 +36,4 @@
"URLSEGMENT.Edit": "Επεξεργασία",
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Άκυρο"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/en.js b/javascript/lang/src/en.js
index c1062cc4..340a53fe 100644
--- a/javascript/lang/src/en.js
+++ b/javascript/lang/src/en.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Cancel",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/eo.js b/javascript/lang/src/eo.js
index 91ade740..29c56bbd 100644
--- a/javascript/lang/src/eo.js
+++ b/javascript/lang/src/eo.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "Akcepti",
"URLSEGMENT.Cancel": "Rezigni",
"URLSEGMENT.UpdateURL": "Ĝisdatigi je URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/es.js b/javascript/lang/src/es.js
index c0505b00..19536abb 100644
--- a/javascript/lang/src/es.js
+++ b/javascript/lang/src/es.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "Ok",
"URLSEGMENT.Cancel": "Cancelar",
"URLSEGMENT.UpdateURL": "Actualizar URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/fa_IR.js b/javascript/lang/src/fa_IR.js
index aa840412..632164de 100644
--- a/javascript/lang/src/fa_IR.js
+++ b/javascript/lang/src/fa_IR.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "تایید",
"URLSEGMENT.Cancel": "لغو",
"URLSEGMENT.UpdateURL": "به روز رسانی URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/fi.js b/javascript/lang/src/fi.js
index c23965e4..318bd03e 100644
--- a/javascript/lang/src/fi.js
+++ b/javascript/lang/src/fi.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Peruuta",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/fr.js b/javascript/lang/src/fr.js
index 63156edc..94d8dd16 100644
--- a/javascript/lang/src/fr.js
+++ b/javascript/lang/src/fr.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "Ok",
"URLSEGMENT.Cancel": "Annuler",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/hu.js b/javascript/lang/src/hu.js
index a0b99910..e020bed3 100644
--- a/javascript/lang/src/hu.js
+++ b/javascript/lang/src/hu.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Mégsem",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/id.js b/javascript/lang/src/id.js
index 43299456..525e97c3 100644
--- a/javascript/lang/src/id.js
+++ b/javascript/lang/src/id.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Batal",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/is.js b/javascript/lang/src/is.js
index a3574d3f..aa207c1d 100644
--- a/javascript/lang/src/is.js
+++ b/javascript/lang/src/is.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "Allt í lagi",
"URLSEGMENT.Cancel": "Hætta við",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/it.js b/javascript/lang/src/it.js
index 61b17786..62df8d4c 100644
--- a/javascript/lang/src/it.js
+++ b/javascript/lang/src/it.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Annulla",
"URLSEGMENT.UpdateURL": "Aggiornare l'URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/ja.js b/javascript/lang/src/ja.js
index 2b392228..0b1cf47d 100644
--- a/javascript/lang/src/ja.js
+++ b/javascript/lang/src/ja.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "キャンセル",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/ko.js b/javascript/lang/src/ko.js
index 6ebe59be..21775291 100644
--- a/javascript/lang/src/ko.js
+++ b/javascript/lang/src/ko.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "취소",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/lt.js b/javascript/lang/src/lt.js
index 3ae04dca..00b9a194 100644
--- a/javascript/lang/src/lt.js
+++ b/javascript/lang/src/lt.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "Gerai",
"URLSEGMENT.Cancel": "Atšaukti",
"URLSEGMENT.UpdateURL": "Atnaujinti URL dalį"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/mi.js b/javascript/lang/src/mi.js
index 6e364725..e6ffec5d 100644
--- a/javascript/lang/src/mi.js
+++ b/javascript/lang/src/mi.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "ĀE",
"URLSEGMENT.Cancel": "Whakakore",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/nb.js b/javascript/lang/src/nb.js
index 8165fc42..6c3e3239 100644
--- a/javascript/lang/src/nb.js
+++ b/javascript/lang/src/nb.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Avbryt",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/nl.js b/javascript/lang/src/nl.js
index 2368c088..3bf88aee 100644
--- a/javascript/lang/src/nl.js
+++ b/javascript/lang/src/nl.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Annuleren",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/pl.js b/javascript/lang/src/pl.js
index c5bacd34..173096ec 100644
--- a/javascript/lang/src/pl.js
+++ b/javascript/lang/src/pl.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Anuluj",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/ro.js b/javascript/lang/src/ro.js
index 7ba61318..5f23cf56 100644
--- a/javascript/lang/src/ro.js
+++ b/javascript/lang/src/ro.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Renunţare",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/ru.js b/javascript/lang/src/ru.js
index 8f8b4271..5151c2c4 100644
--- a/javascript/lang/src/ru.js
+++ b/javascript/lang/src/ru.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "ОК",
"URLSEGMENT.Cancel": "Отмена",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/sk.js b/javascript/lang/src/sk.js
index 3eafaf47..484cad71 100644
--- a/javascript/lang/src/sk.js
+++ b/javascript/lang/src/sk.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Zrušiť",
"URLSEGMENT.UpdateURL": "Aktualizovať URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/sl.js b/javascript/lang/src/sl.js
index eb2544b0..875024a9 100644
--- a/javascript/lang/src/sl.js
+++ b/javascript/lang/src/sl.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Prekliči",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/sr.js b/javascript/lang/src/sr.js
index b26d5ab6..83407c94 100644
--- a/javascript/lang/src/sr.js
+++ b/javascript/lang/src/sr.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "У реду",
"URLSEGMENT.Cancel": "Одустани",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/sr_RS@latin.js b/javascript/lang/src/sr_RS@latin.js
index 001bc713..3a837788 100644
--- a/javascript/lang/src/sr_RS@latin.js
+++ b/javascript/lang/src/sr_RS@latin.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "U redu",
"URLSEGMENT.Cancel": "Odustani",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/sv.js b/javascript/lang/src/sv.js
index b438b15a..6b0771fa 100644
--- a/javascript/lang/src/sv.js
+++ b/javascript/lang/src/sv.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "OK",
"URLSEGMENT.Cancel": "Avbryt",
"URLSEGMENT.UpdateURL": "Uppdatera URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/src/zh.js b/javascript/lang/src/zh.js
index f49c9785..ad4c1b31 100644
--- a/javascript/lang/src/zh.js
+++ b/javascript/lang/src/zh.js
@@ -42,4 +42,4 @@
"URLSEGMENT.OK": "确定",
"URLSEGMENT.Cancel": "取消",
"URLSEGMENT.UpdateURL": "Update URL"
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/sv.js b/javascript/lang/sv.js
index 4e206ea8..92227a93 100644
--- a/javascript/lang/sv.js
+++ b/javascript/lang/sv.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "Avbryt",
"URLSEGMENT.UpdateURL": "Uppdatera URL"
});
-}
\ No newline at end of file
+}
diff --git a/javascript/lang/zh.js b/javascript/lang/zh.js
index ddd10b5f..5169a548 100644
--- a/javascript/lang/zh.js
+++ b/javascript/lang/zh.js
@@ -48,4 +48,4 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
"URLSEGMENT.Cancel": "取消",
"URLSEGMENT.UpdateURL": "Update URL"
});
-}
\ No newline at end of file
+}
diff --git a/scss/_AssetAdmin.scss b/scss/_AssetAdmin.scss
index 52e65e43..484d53e6 100644
--- a/scss/_AssetAdmin.scss
+++ b/scss/_AssetAdmin.scss
@@ -2,7 +2,7 @@
.cms-content-fields {
.cms-edit-form.AssetAdmin {
width: 100%;
- overflow-y:auto; //adds scrolling only to the datagrid
+ overflow-y:auto; //adds scrolling only to the datagrid
}
/**
@@ -60,5 +60,5 @@
}
}
}
-}
+}
diff --git a/scss/_CMSMain.scss b/scss/_CMSMain.scss
index cd86c654..dde47a0d 100644
--- a/scss/_CMSMain.scss
+++ b/scss/_CMSMain.scss
@@ -1,7 +1,7 @@
/**
- * Style custom to the CMSMain admin interface. CMSMain extends the built in
- * SilverStripe admin section styles. As much as possible we want to use those
- * built in styles. If anything in this file can be implemented in a generic
+ * Style custom to the CMSMain admin interface. CMSMain extends the built in
+ * SilverStripe admin section styles. As much as possible we want to use those
+ * built in styles. If anything in this file can be implemented in a generic
* way then it should be include in the admin scss files.
*
* @package cms
@@ -123,4 +123,4 @@
#Form_EditForm #Title .update {
margin-left: 7px;
-}
\ No newline at end of file
+}
diff --git a/scss/screen.scss b/scss/screen.scss
index a1352871..f813e7d1 100644
--- a/scss/screen.scss
+++ b/scss/screen.scss
@@ -1,9 +1,9 @@
/**
* This file is the central collection of included modules, links to custom SCSS files,
* and any global SCSS variable definitions.
- *
+ *
* DO NOT ADD stylesheet rules to this file directly!
- *
+ *
* Note: By prefixing files with an underscore, they won't create individual CSS files.
*/
diff --git a/tasks/RemoveOrphanedPagesTask.php b/tasks/RemoveOrphanedPagesTask.php
index 5de582af..313e710d 100644
--- a/tasks/RemoveOrphanedPagesTask.php
+++ b/tasks/RemoveOrphanedPagesTask.php
@@ -5,7 +5,7 @@
* Shows the pages to an administrator, who can then
* decide which pages to remove by ticking a checkbox
* and manually executing the removal.
- *
+ *
* Caution: Pages also count as orphans if they don't
* have parents in this stage, even if the parent has a representation
* in the other stage:
@@ -16,7 +16,7 @@
* before and after orphan removal.
*
* @author Ingo Schommer (
@silverstripe.com), SilverStripe Ltd.
- *
+ *
* @package cms
* @subpackage tasks
*/
@@ -87,13 +87,13 @@ in the other stage:
$latestAuthor = DataObject::get_by_id('Member', $latestVersion->AuthorID);
$orphanBaseClass = ClassInfo::baseDataClass($this->orphanedSearchClass);
$stageRecord = Versioned::get_one_by_stage(
- $this->orphanedSearchClass,
+ $this->orphanedSearchClass,
'Stage',
array("\"$orphanBaseClass\".\"ID\"" => $orphan->ID)
);
$liveRecord = Versioned::get_one_by_stage(
- $this->orphanedSearchClass,
- 'Live',
+ $this->orphanedSearchClass,
+ 'Live',
array("\"$orphanBaseClass\".\"ID\"" => $orphan->ID)
);
$label = sprintf(
@@ -125,11 +125,11 @@ in the other stage:
)
));
$fields->push(new OptionSetField(
- 'OrphanOperation',
+ 'OrphanOperation',
_t('RemoveOrphanedPagesTask.CHOOSEOPERATION', 'Choose operation:'),
array(
'rebase' => _t(
- 'RemoveOrphanedPagesTask.OPERATION_REBASE',
+ 'RemoveOrphanedPagesTask.OPERATION_REBASE',
sprintf(
'Rebase selected to a new holder page "%s" and unpublish. None of these pages will show up for website visitors.',
$this->rebaseHolderTitle()
@@ -143,7 +143,7 @@ in the other stage:
'Warning',
sprintf('%s
',
_t(
- 'RemoveOrphanedPagesTask.DELETEWARNING',
+ 'RemoveOrphanedPagesTask.DELETEWARNING',
'Warning: These operations are not reversible. Please handle with care.'
)
)
@@ -216,8 +216,8 @@ in the other stage:
$orphanBaseClass = ClassInfo::baseDataClass($this->orphanedSearchClass);
foreach($orphanIDs as $id) {
$stageRecord = Versioned::get_one_by_stage(
- $this->orphanedSearchClass,
- 'Stage',
+ $this->orphanedSearchClass,
+ 'Stage',
array("\"$orphanBaseClass\".\"ID\"" => $id)
);
if($stageRecord) {
@@ -227,8 +227,8 @@ in the other stage:
unset($stageRecord);
}
$liveRecord = Versioned::get_one_by_stage(
- $this->orphanedSearchClass,
- 'Live',
+ $this->orphanedSearchClass,
+ 'Live',
array("\"$orphanBaseClass\".\"ID\"" => $id)
);
if($liveRecord) {
@@ -258,7 +258,7 @@ in the other stage:
$orphanBaseClass = ClassInfo::baseDataClass($this->orphanedSearchClass);
foreach($orphanIDs as $id) {
$stageRecord = Versioned::get_one_by_stage(
- $this->orphanedSearchClass,
+ $this->orphanedSearchClass,
'Stage',
array("\"$orphanBaseClass\".\"ID\"" => $id)
);
@@ -273,7 +273,7 @@ in the other stage:
//unset($stageRecord);
}
$liveRecord = Versioned::get_one_by_stage(
- $this->orphanedSearchClass,
+ $this->orphanedSearchClass,
'Live',
array("\"$orphanBaseClass\".\"ID\"" => $id)
);
@@ -298,7 +298,7 @@ in the other stage:
/**
* Gets all orphans from "Stage" and "Live" stages.
- *
+ *
* @param string $class
* @param array $filter
* @param string $sort
diff --git a/tasks/SiteTreeMaintenanceTask.php b/tasks/SiteTreeMaintenanceTask.php
index 66dbd949..5d25366c 100644
--- a/tasks/SiteTreeMaintenanceTask.php
+++ b/tasks/SiteTreeMaintenanceTask.php
@@ -18,14 +18,14 @@ class SiteTreeMaintenanceTask extends Controller {
$page->write();
if($urlSegment != $page->URLSegment) {
echo _t(
- 'SiteTree.LINKSCHANGEDTO',
- " changed {url1} -> {url2}",
+ 'SiteTree.LINKSCHANGEDTO',
+ " changed {url1} -> {url2}",
array('url1' => $urlSegment, 'url2' => $page->URLSegment)
);
}
else {
echo _t(
- 'SiteTree.LINKSALREADYUNIQUE',
+ 'SiteTree.LINKSALREADYUNIQUE',
" {url} is already unique",
array('url' => $urlSegment)
);
diff --git a/templates/BlankPage.ss b/templates/BlankPage.ss
index 27486d05..84d06519 100644
--- a/templates/BlankPage.ss
+++ b/templates/BlankPage.ss
@@ -11,4 +11,4 @@
$Form