[Rt-commit] rt branch, 4.0/remove-bookmarks-hardcoding, created. rt-4.0.13-49-g240a9e0

[Kevin Falcone]

The branch, 4.0/remove-bookmarks-hardcoding has been created
        at  240a9e033394a6d95cb2af4ed6ee452b060ef165 (commit)

- Log -----------------------------------------------------------------
commit 240a9e033394a6d95cb2af4ed6ee452b060ef165
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue May 28 12:30:06 2013 -0400

    Don't force Bookmarks to be unlimited.
    
    This code dates from the original Bookmarks implementation when we just
    used '__Bookmarks__' instead of "id = '__Bookmarked__'".
    
    Without this, if you have 20 bookmarks, they all list on your homepage.
    After the change, it obeys RowsPerPage.
    
    Bookmarks is a normal search now, so you can always click on the title
    to see a 'full' list.
    
    I'm leaving __Bookmarks__ alone because it's the old deprecated code
    that we're going to remove in 4.4 anyway.

diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index 8bdbd8a..7d7df64 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -125,10 +125,7 @@ foreach ( $SearchArg, $ProcessedSearchArg ) {
     $_->{'Format'} =~ s/__(Web(?:Path|Base|BaseURL))__/scalar RT->Config->Get($1)/ge;
     # extract-message-catalog would "$1", so we avoid quotes for loc calls
     $_->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/my $f = "$1"; loc($f)/ge;
-    if ( $_->{'Query'} =~ /__Bookmarked__/ ) {
-        $_->{'Rows'} = 999;
-    }
-    elsif ( $_->{'Query'} =~ /__Bookmarks__/ ) {
+    if ( $_->{'Query'} =~ /__Bookmarks__/ ) {
         $_->{'Rows'} = 999;
 
         # DEPRECATED: will be here for a while up to 3.10/4.0

-----------------------------------------------------------------------