Merging bug fix from rel-1-2

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 081bf18..2d2b859 100755 (executable)
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -235,7 +235,7 @@ printend
                print mktablerow(6,$toggle,$results->[$i]{'bookfundid'},
                $results->[$i]{'bookfundname'},$results->[$i]{'bookfundgroup'},
                mklink("$script_name?op=add_form&bookfundid=".$results->[$i]{'bookfundid'},'Edit'),
-               mklink("$script_name?op=delete_confirm&bookfundid=".$results->[$i]{'bookfundid'},'Delete',''));
+               mklink("$script_name?op=delete_confirm&bookfundid=".$results->[$i]{'bookfundid'},'Delete'));
        }
        print mktableft;
        print "<form action='$script_name' method=post>";

diff --git a/admin/currency.pl b/admin/currency.pl
index 5f7aa58..e4dc61c 100755 (executable)
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -233,7 +233,7 @@ printend
                }
                print mktablerow(4,$toggle,$results->[$i]{'currency'},$results->[$i]{'rate'},
                mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'currency'},'Edit'),
-               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete',''));
+               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete'));
        }
        print mktableft;
        print "<form action='$script_name' method=post>";

diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl
index 2090f33..70689b2 100755 (executable)
--- a/admin/itemtypes.pl
+++ b/admin/itemtypes.pl
@@ -257,7 +257,7 @@ printend
                $results->[$i]{'description'},$results->[$i]{'loanlength'},
                $results->[$i]{'renewalsallowed'}==1?'Yes':'No',$results->[$i]{'rentalcharge'},
                mklink("$script_name?op=add_form&itemtype=".$results->[$i]{'itemtype'},'Edit'),
-               mklink("$script_name?op=delete_confirm&itemtype=".$results->[$i]{'itemtype'},'Delete',''));
+               mklink("$script_name?op=delete_confirm&itemtype=".$results->[$i]{'itemtype'},'Delete'));
        }
        print mktableft;
        print "<form action='$script_name' method=post>";

diff --git a/admin/printers.pl b/admin/printers.pl
index a01dd1e..79aee4d 100755 (executable)
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -224,7 +224,7 @@ printend
                }
                print mktablerow(5,$toggle,$results->[$i]{'printername'},$results->[$i]{'printqueue'},$results->[$i]{'printtype'},
                mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'printername'},'Edit'),
-               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'printername'},'Delete',''));
+               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'printername'},'Delete'));
        }
        print mktableft;
        print "<form action='$script_name' method=post>";

diff --git a/admin/stopwords.pl b/admin/stopwords.pl
index c2b4811..cc500b4 100755 (executable)
--- a/admin/stopwords.pl
+++ b/admin/stopwords.pl
@@ -213,7 +213,7 @@ printend
                        $toggle="white";
                }
                print mktablerow(2,$toggle,$results->[$i]{'word'},
-               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'word'},'Delete',''));
+               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'word'},'Delete'));
        }
        print mktableft;
        print "<form action='$script_name' method=post>";