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

Merge branch '3' into 4

Browse Source
This commit is contained in:
Daniel Hensby 2017-07-25 16:17:44 +01:00
commit 884f53e0f2
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,9 +1,9 @@
language: php
sudo: false
dist: precise
sudo: false
addons:
apt:
packages:

4
docs/en/00_Getting_Started/01_Installation/01_Linux_Unix.md
View File

@ -1,6 +1,6 @@
# Installation on Linux, Unix and *nix like Operating Systems
SilverStripe should be able to be installed on any Linux, Unix or *nix like OS as long as the correct server software is installed and configured (referred to a *nix in this document from herein). It is common that web hosting that you may use for your production SilverStripe application will be *nix based, here you may also want to use *nix locally to ensure how you develop locally mimics closely your production environment.
SilverStripe should be able to be installed on any Linux, Unix or *nix like OS as long as the correct server software is installed and configured (referred to as *nix in this document from herein). It is common that web hosting that you may use for your production SilverStripe application will be *nix based, here you may also want to use *nix locally to ensure how you develop locally mimics closely your production environment.
Is important to ensure you check the [Server Requirements](/getting_started/server_requirements) list before acquiring and installing SilverStripe on your *nix server (locally or otherwise).
@ -21,4 +21,4 @@ Note: Many of the following guides simply download SilverStripe as a zipped file
* [How to install SilverStripe CMS on a Linux Virtual Server](http://www.rosehosting.com/blog/how-to-install-silverstripe-cms-on-a-linux-virtual-server/)
_If you find further good *nix related installation articles please email these to community+docs@silverstripe.org._
_If you find further good *nix related installation articles please email these to community+docs@silverstripe.org._

10
src/Forms/GridField/GridField.php
View File

@ -127,12 +127,6 @@ class GridField extends FormField
$this->setConfig($config);
$state = $this->config->getComponentByType(GridState_Component::class);
if (!$state) {
$this->config->addComponent(new GridState_Component());
}
$this->state = new GridState($this);
$this->addExtraClass('grid-field');
@ -211,6 +205,10 @@ class GridField extends FormField
{
$this->config = $config;
if (!$this->config->getComponentByType(GridState_Component::class)) {
$this->config->addComponent(new GridState_Component());
}
return $this;
}