Merge branch '3'

admin/code/LeftAndMain.php

@@ -1345,7 +1345,7 @@ class LeftAndMain extends Controller implements PermissionProvider
             }
 
             $link = Controller::join_links($recordController->Link("show"), $record->ID);
-            $html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))->forTemplate() ;
+            $html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))->forTemplate(). '</li>';
 
             $data[$id] = array(
                 'html' => $html,

admin/templates/SilverStripe/Admin/Includes/LeftAndMain_TreeNode.ss

@@ -3,4 +3,3 @@
 	<a href="$Link" title="$Title.ATT"><ins class="jstree-icon">&nbsp;</ins>
 		<span class="text">$TreeTitle</span>
 	</a>
-</li>

docs/en/02_Developer_Guides/01_Templates/01_Syntax.md

@@ -490,7 +490,7 @@ The `<% with %>` tag lets you change into a new scope. Consider the following ex
 This is functionalty the same as the following:
 
 	:::ss
-	Hello, $CurrentMember.FirstName, welcome back. Yout current balance is $CurrentMember.Balance
+	Hello, $CurrentMember.FirstName, welcome back. Your current balance is $CurrentMember.Balance
 
 Notice that the first example is much tidier, as it removes the repeated use of the `$CurrentMember` accessor.
 

docs/en/04_Changelogs/rc/3.4.5-rc1.md

@@ -0,0 +1,10 @@
+# 3.4.5-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2017-01-30 [10d9f90](https://github.com/silverstripe/silverstripe-cms/commit/10d9f9080b6cc6c909abdae796e8ce944036ccc2) to allow ASSETS_DIR to be a subdirectory (Brendan Halley)
+ * 2017-02-08 [0fe4ec4](https://github.com/silverstripe/silverstripe-framework/commit/0fe4ec4537899fa90870647233772551204ff2a5) Fix issue with nested tree view (Daniel Hensby)

docs/en/04_Changelogs/rc/3.5.3-rc1.md

@@ -0,0 +1,10 @@
+# 3.5.3-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2017-01-30 [10d9f90](https://github.com/silverstripe/silverstripe-cms/commit/10d9f9080b6cc6c909abdae796e8ce944036ccc2) to allow ASSETS_DIR to be a subdirectory (Brendan Halley)
+ * 2017-02-08 [0fe4ec4](https://github.com/silverstripe/silverstripe-framework/commit/0fe4ec4537899fa90870647233772551204ff2a5) Fix issue with nested tree view (Daniel Hensby)

lang/cs.yml

@@ -467,6 +467,7 @@ cs:
     PASSWORD: Heslo
     PASSWORDEXPIRED: 'Vaše heslo expirovalo. Prosím, zvolte nové heslo.'
     PLURALNAME: Členové
+    REMEMBERME: "Zapamatovat si mě pro příště?"
     SINGULARNAME: Člen
     SUBJECTPASSWORDCHANGED: 'Vaše heslo bylo změněno'
     SUBJECTPASSWORDRESET: 'Nulovací odkaz pro Vaše heslo'

src/ORM/Hierarchy/Hierarchy.php

@@ -149,7 +149,7 @@ class Hierarchy extends DataExtension
      */
     public function getChildrenAsUL(
         $attributes = "",
-        $titleEval = '"<li>" . $child->Title . "</li>"',
+        $titleEval = '"<li>" . $child->Title',
         $extraArg = null,
         $limitToMarked = false,
         $childrenMethod = "AllChildrenIncludingDeleted",
@@ -202,10 +202,6 @@ class Hierarchy extends DataExtension
                     } else {
                         $output .= eval("return $titleEval;");
                     }
-                    $output = trim($output);
-                    if (substr($output, -5) == '</li>') {
-                        $output = trim(substr($output, 0, -5));
-                    }
                     $output .= "\n";
 
                     $numChildren = $child->$numChildrenMethod();

tests/php/ORM/SQLSelectTest.php

@@ -40,13 +40,17 @@ class SQLSelectTest extends SapphireTest
 
         //basic counting
         $qry = SQLSelectTest\TestObject::get()->dataQuery()->getFinalisedQuery();
-        $qry->setGroupBy('"Common"');
         $ids = $this->allFixtureIDs(SQLSelectTest\TestObject::class);
         $count = $qry->count('"SQLSelectTest_DO"."ID"');
         $this->assertEquals(count($ids), $count);
         $this->assertInternalType("int", $count);
         //test with `having`
         if (DB::get_conn() instanceof MySQLDatabase) {
+            $qry->setSelect(array(
+                'Date' => 'MAX("Date")',
+                'Common' => '"Common"',
+            ));
+            $qry->setGroupBy('"Common"');
             $qry->setHaving('"Date" > 2012-02-01');
             $count = $qry->count('"SQLSelectTest_DO"."ID"');
             $this->assertEquals(1, $count);