From 695d26434cfed9f9bd1eb887fe050ec0be6f5c0d Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 26 Feb 2013 09:48:14 -0100
Subject: [PATCH 1/2] U4-600 Wrong membersearch.png path in MemberSearch.ascx

---
 src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx        | 6 +++---
 .../umbraco.presentation/umbraco/members/MemberSearch.ascx  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx b/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
index 579201c83c..76e7749e0e 100644
--- a/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
+++ b/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
@@ -2,7 +2,7 @@
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
   <div class="dashboardWrapper">
     <h2>Member Search</h2>
-    <img src="./dashboard/images/membersearch.png" alt="Videos" class="dashboardIcon" />
+    <img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dashboard/images/membersearch.png" %>" alt="Member Search" class="dashboardIcon" />
 <p class="guiDialogNormal">
 	<asp:TextBox id="searchQuery" runat="server"></asp:TextBox>
 	<asp:Button id="ButtonSearch" runat="server" Text="Button" onclick="ButtonSearch_Click"></asp:Button></p>
@@ -19,14 +19,14 @@
 	</HeaderTemplate>
 	  <ItemTemplate>
 		<tr>
-		  <td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
+		  <td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
 		  <td><%# Eval("Email") %></td>
 		  <td><%# Eval("LoginName") %></td>
 		</tr>
 	  </ItemTemplate>
 	  <AlternatingItemTemplate>
 		<tr class="alt">
-		  <td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
+		  <td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
 		  <td><%# Eval("Email") %></td>
 		  <td><%# Eval("LoginName") %></td>
 		</tr>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
index 579201c83c..76e7749e0e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
@@ -2,7 +2,7 @@
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
   <div class="dashboardWrapper">
     <h2>Member Search</h2>
-    <img src="./dashboard/images/membersearch.png" alt="Videos" class="dashboardIcon" />
+    <img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dashboard/images/membersearch.png" %>" alt="Member Search" class="dashboardIcon" />
 <p class="guiDialogNormal">
 	<asp:TextBox id="searchQuery" runat="server"></asp:TextBox>
 	<asp:Button id="ButtonSearch" runat="server" Text="Button" onclick="ButtonSearch_Click"></asp:Button></p>
@@ -19,14 +19,14 @@
 	</HeaderTemplate>
 	  <ItemTemplate>
 		<tr>
-		  <td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
+		  <td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
 		  <td><%# Eval("Email") %></td>
 		  <td><%# Eval("LoginName") %></td>
 		</tr>
 	  </ItemTemplate>
 	  <AlternatingItemTemplate>
 		<tr class="alt">
-		  <td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
+		  <td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
 		  <td><%# Eval("Email") %></td>
 		  <td><%# Eval("LoginName") %></td>
 		</tr>

From d503deb8c57fd6f8fadbe2e7f366fe82b9b55b06 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 26 Feb 2013 21:07:59 +0600
Subject: [PATCH 2/2] reverted member index config, for pre 6.1 we will still
 need to manually set the member fields.

---
 .../config/ExamineIndex.Release.config        | 12 ++++++++++-
 src/Umbraco.Web.UI/config/ExamineIndex.config | 20 ++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.Release.config b/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
index 4d0c38c59c..c95f24d1e2 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.Release.config
@@ -11,7 +11,17 @@ More information and documentation can be found on CodePlex: http://umbracoexami
   <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/"/>
 
   <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
-  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/"/>
+  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
+    <IndexAttributeFields>
+      <add Name="id" />
+      <add Name="nodeName"/>
+      <add Name="updateDate" />
+      <add Name="writerName" />
+      <add Name="loginName" />
+      <add Name="email" />
+      <add Name="nodeTypeAlias" />
+    </IndexAttributeFields>
+  </IndexSet>
     
   <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
   <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.config b/src/Umbraco.Web.UI/config/ExamineIndex.config
index c702172079..b918c6413e 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.config
@@ -7,9 +7,19 @@ Index/Search providers can be defined in the UmbracoSettings.config
 More information and documentation can be found on CodePlex: http://umbracoexamine.codeplex.com
 -->
 <ExamineLuceneIndexSets>
-    <!-- The internal index set used by Umbraco back-office - DO NOT REMOVE -->
-    <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
-        
-    <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
-    <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/"/>
+  <!-- The internal index set used by Umbraco back-office - DO NOT REMOVE -->
+  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
+
+  <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
+  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
+    <IndexAttributeFields>
+      <add Name="id" />
+      <add Name="nodeName"/>
+      <add Name="updateDate" />
+      <add Name="writerName" />
+      <add Name="loginName" />
+      <add Name="email" />
+      <add Name="nodeTypeAlias" /> 
+    </IndexAttributeFields>
+  </IndexSet>
 </ExamineLuceneIndexSets>
\ No newline at end of file