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

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-10-09 05:19:49 +13:00
commit 587861c5ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/model/SiteTree.php
View File

@ -174,7 +174,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
/** /**
* @see SiteTree::nested_urls() * @see SiteTree::nested_urls()
*/ */
private static $nested_urls = false; private static $nested_urls = true;
/** /**
* @see SiteTree::set_create_default_pages() * @see SiteTree::set_create_default_pages()

4
thirdparty/multifile/multifile.js vendored
View File

@ -43,7 +43,7 @@
// Modified by: Silverstripe Ltd. (changed naming of file-input-elements) // Modified by: Silverstripe Ltd. (changed naming of file-input-elements)
public function ObservableObject() { function ObservableObject() {
this.functions = []; this.functions = [];
} }
ObservableObject.prototype = { ObservableObject.prototype = {
@ -63,7 +63,7 @@ ObservableObject.prototype = {
var MultiSelectorObserver = new ObservableObject(); var MultiSelectorObserver = new ObservableObject();
public function MultiSelector( list_target, max, upload_button ){ function MultiSelector( list_target, max, upload_button ){
this.upload_button = upload_button; this.upload_button = upload_button;
this.upload_button.setAttribute("disabled", "disabled"); this.upload_button.setAttribute("disabled", "disabled");