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

Merge branch 'master' into integration

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-10 00:39:29 +02:00
commit cf304044b8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/LeftAndMain.php
View File

@ -1172,7 +1172,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
* @return string
*/
public function CMSVersion() {
if(file_exists(CMS_PATH . '/silverstripe_version')) {
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');

2
admin/javascript/LeftAndMain.EditForm.js
View File

@ -142,7 +142,7 @@
* Suppress submission unless it is handled through ajaxSubmit().
*/
onsubmit: function(e, button) {
this.parents('.cms-content').submitForm(this, button);
this.closest('.cms-content').submitForm(this, button);
return false;
},

2
forms/gridfield/GridField.php
View File

@ -619,7 +619,7 @@ class GridField extends FormField {
}
}
switch($request->getHeader('X-Get-Fragment')) {
switch($request->getHeader('X-Pjax')) {
case 'CurrentField':
return $this->FieldHolder();
break;

2
forms/gridfield/GridFieldDetailForm.php
View File

@ -311,7 +311,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
$form->sessionMessage($message, 'good');
return Controller::curr()->redirectBack();
return Controller::curr()->redirect($this->Link());
}
function doDelete($data, $form) {