From 4ea146fc07fab38e662fd5331fbfbae727d40ca5 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 3 Sep 2009 09:00:50 -0700
Subject: [PATCH] WikiMaster keyword pagination fixes, re # 10856.

Add pagination template variables to the default byKeyword template.
Fix pagination URL for keywords.

Conflicts:

	docs/changelog/7.x.x.txt
---
 docs/changelog/7.x.x.txt                         |   1 +
 .../wiki-master-by-keyword-template.tmpl.wgpkg   | Bin 0 -> 1029 bytes
 lib/WebGUI/Asset/Wobject/WikiMaster.pm           |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8e0821eda..e9cf324fc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.8.0
+ - fixed #10856: no paginate in wiki keyword search 
  - fixed #10877: getProfileUrl() broken
  - fixed #10844: Ad Sales: No template variable Help
  - fixed #10873: Code editor breaks CSS comments
diff --git a/docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg b/docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..f43b3475f31f80fff536c2267c199c29c38f19b8
GIT binary patch
literal 1029
zcmV+g1p50QiwFP!00000|Ls<7Z{j!*=JWmvD<_@qq%9<n0OdHOzU*$RYgb*BZufMY
zkRb+Kf^FFjY<9K({l-opE~Wi&D$<=qB$_lc^UULUd7xU^|K<CBs})r$=H3kLJqY2B
zHkV%sf_m6$HS5i=RY5`EhkgY?$o{WXX)J--m?xCYpU;;nBGvO|b2zx{;q3hd*Z-2q
zvJT3>QPV!Rs}G8^S0W0C&7$wS`XBm1W2^sRBZw*ps=5DbU;VG{pZaTL`2Gf#(9>ig
z60FG(YmLXV1z}owsDu9c`>nMr%_W`^_mz-b5UDA#juyrsjU@q`_%t)VUc<BT#*kp8
z-+dKag7w74urx_FX4pb)@ja1_5~^k-E@K&4-BT9xl?C-ngUT2eiav!SU$w*+1jl_m
zRX2D%2RI<~C?#JpBJW_WFRjfb`zZWLAXbX#BIusZ=^rFpaT(ji$v3HFn99VGUV-1y
z0%}0y(I`8b=OIVy!dEpkpp2sGg2pjn+vla~Msm${Ch}T2rI<>dip%(2Otp=2O21BG
z-w#-K7WBF%-*AZ~Dwy=THF!N>U``Xb=MD+y0tx86x`HQoZ4|qk&|Vj#nIx0n2VRK;
zN9_$f2U=5|5CF#TffxX-*|Y}L{%146Ytci0^0z2XW0GX3TQk-*1v)VVD8rg^RyADC
zc*=B@s_Qh-R6vG;R!o;@3}dE%RT%<|a=WFzId<t#6_P9|Phm`^q=(SYKLzc^Z>T(%
z>k2McROxCe`aJM^FFG@rB8yq@s{ujaQWSws;CaBDp0gQ|RNu+uz2u7<EMW<^`){}8
zY=+r%=ZaBAfM6bE262b3m-%d|KH^30e@{jq?k+o>6EoYLPQMU@(%tOuHIM0p=Bwld
z^(Z(#uD7FR>0~=@^CPnu$Q)mx(+m|Wf_{m~1Vi6`En|wo{Y*)|-mTI^l^JI|N^*`t
zX;E`3K5`9g#&$4lPR9-kmiEo~y+Fo61Mx|%h<I3luq|EjvD<!2zvWQv(8(gO1o^Nj
zo~d7_bJ4%PdRk2i3uQzp*U3k+MAdm-qwO=f&ChN1dcEy8j@=HJSyr$q=W99L)h3V;
zki^ZXIE9$;)g^n+<sz?!b5{8Mlk4bORV@WafEbLD5_nw96SV)@%H43372PlMtQDzL
zX72@6GK#cQkN&L^xjNLX0eZ=du(8a9-P`R0YCJ7OKRFrm&*SBnBxx`_7Z>_=*=C<g
z5UOr7Q2NC-f^E*a>7G+u7<Bv9xNFqyH|nE~2JNU7g;C1^fJp?oDCm6((=WrbC~9HZ
z7tQnG!|F76aOiDXS@1Jo@ju@Dc#WSE2aH1n4iz|5;8218Nd^7^ua0c@01^NIJb3>*

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
index cf983a540..6fb0b6385 100644
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@@ -542,7 +542,7 @@ sub www_byKeyword {
         keyword         => $keyword,   
         usePaginator    => 1,
         });
-    $p->setBaseUrl($self->getUrl("func=byKeyword"));
+    $p->setBaseUrl($self->getUrl("func=byKeyword;keyword=".$keyword));
     foreach my $assetData (@{$p->getPageData}) {
         my $asset = WebGUI::Asset->newByDynamicClass($self->session, $assetData->{assetId});
         next unless defined $asset;