From aec1d542b18d3c897de2e525b8ec7adbf434e70b Mon Sep 17 00:00:00 2001
From: Franco Springveldt <franco@silverstripe.com>
Date: Thu, 14 Sep 2017 09:53:29 +1200
Subject: [PATCH] FIX updated depreated Member::currentUser() references

---
 src/Model/Blog.php           | 3 ++-
 src/Model/BlogPost.php       | 5 +++--
 tests/BlogCategoryTest.php   | 3 ++-
 tests/BlogPostFilterTest.php | 3 ++-
 tests/BlogTagTest.php        | 2 +-
 tests/BlogTest.php           | 5 +++--
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Model/Blog.php b/src/Model/Blog.php
index 221787f..2f662e3 100644
--- a/src/Model/Blog.php
+++ b/src/Model/Blog.php
@@ -27,6 +27,7 @@ use SilverStripe\Security\Group;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\PermissionProvider;
+use SilverStripe\Security\Security;
 use SilverStripe\View\Requirements;
 
 /**
@@ -216,7 +217,7 @@ class Blog extends Page implements PermissionProvider
     protected function getMember($member = null)
     {
         if (!$member) {
-            $member = Member::currentUser();
+            $member = Security::getCurrentUser();
         }
 
         if (is_numeric($member)) {
diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php
index 0a05df4..c3917bd 100644
--- a/src/Model/BlogPost.php
+++ b/src/Model/BlogPost.php
@@ -22,6 +22,7 @@ use SilverStripe\ORM\UnsavedRelationList;
 use SilverStripe\Security\Group;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
+use SilverStripe\Security\Security;
 use SilverStripe\TagField\TagField;
 use SilverStripe\View\ArrayData;
 use SilverStripe\View\Requirements;
@@ -387,7 +388,7 @@ class BlogPost extends Page
     protected function getMember($member = null)
     {
         if (!$member) {
-            $member = Member::currentUser();
+            $member = Security::getCurrentUser();
         }
 
         if (is_numeric($member)) {
@@ -746,7 +747,7 @@ class BlogPost extends Page
     {
         parent::onBeforeWrite();
 
-        if (!$this->exists() && ($member = Member::currentUser())) {
+        if (!$this->exists() && ($member = Security::getCurrentUser())) {
             $this->Authors()->add($member);
         }
     }
diff --git a/tests/BlogCategoryTest.php b/tests/BlogCategoryTest.php
index d9de583..caf4b4a 100755
--- a/tests/BlogCategoryTest.php
+++ b/tests/BlogCategoryTest.php
@@ -11,6 +11,7 @@ use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\ValidationException;
 use SilverStripe\Security\Member;
+use SilverStripe\Security\Security;
 
 /**
  * @mixin PHPUnit_Framework_TestCase
@@ -48,7 +49,7 @@ class BlogCategoryTest extends FunctionalTest
      */
     public function testBlogPosts()
     {
-        $member = Member::currentUser();
+        $member = Security::getCurrentUser();
 
         if ($member) {
             $member->logout();
diff --git a/tests/BlogPostFilterTest.php b/tests/BlogPostFilterTest.php
index c78fbc9..d82eeaf 100755
--- a/tests/BlogPostFilterTest.php
+++ b/tests/BlogPostFilterTest.php
@@ -6,6 +6,7 @@ use SilverStripe\Blog\Model\Blog;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Security\Member;
+use SilverStripe\Security\Security;
 
 /**
  * @mixin PHPUnit_Framework_TestCase
@@ -38,7 +39,7 @@ class BlogPostFilterTest extends SapphireTest
      */
     public function testFilter()
     {
-        $member = Member::currentUser();
+        $member = Security::getCurrentUser();
 
         if ($member) {
             $member->logout();
diff --git a/tests/BlogTagTest.php b/tests/BlogTagTest.php
index fd3f03c..be4c982 100755
--- a/tests/BlogTagTest.php
+++ b/tests/BlogTagTest.php
@@ -48,7 +48,7 @@ class BlogTagTest extends FunctionalTest
      */
     public function testBlogPosts()
     {
-        $member = Member::currentUser();
+        $member = Security::getCurrentUser();
 
         if ($member) {
             $member->logout();
diff --git a/tests/BlogTest.php b/tests/BlogTest.php
index 72a5cf0..5f1ed76 100755
--- a/tests/BlogTest.php
+++ b/tests/BlogTest.php
@@ -16,6 +16,7 @@ use SilverStripe\ORM\DataModel;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\SS_List;
 use SilverStripe\Security\Member;
+use SilverStripe\Security\Security;
 
 /**
  * @mixin PHPUnit_Framework_TestCase
@@ -58,7 +59,7 @@ class BlogTest extends SapphireTest
 
     public function testGetExcludedSiteTreeClassNames()
     {
-        $member = Member::currentUser();
+        $member = Security::getCurrentUser();
 
         if ($member) {
             $member->logout();
@@ -82,7 +83,7 @@ class BlogTest extends SapphireTest
 
     public function testGetArchivedBlogPosts()
     {
-        $member = Member::currentUser();
+        $member = Security::getCurrentUser();
 
         if ($member) {
             $member->logout();