0001183: Can't close the popup dimension # view window

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 8687b336bc7e5bdc327ba9f6ccac01ac3fe0d70a..774dbd0e8f0d112f8a1f7e884e4af1ccf4979152 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -187,7 +187,7 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
                        echo "<td align=center><a href='$path_to_root/admin/attachments.php?vw=$id' target='blanc_'>"._("View Attachment")."</a></td>\n";
                echo "<td align=center><a href='javascript:window.print();'>"._("Print")."</a></td>\n";
        }       
-       echo "<td align=center><a href='javascript:goBack();'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
+       echo "<td align=center><a href='javascript:goBack(\"$no_menu\");'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
        end_row();
        end_table();
        if ($center)

diff --git a/js/utils.js b/js/utils.js
index 781382b32b12ecfedf593393fd12e443436dfd87..5af7bfb4f644bab6e6e54836eb4ba38d5162d8a6 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -251,8 +251,8 @@ function get_amount(doc, label) {
                return isNaN(val) ? 0 : val;
 }
 
-function goBack() {
-       if (window.history.length <= 1)
+function goBack(no_menu) {
+       if (no_menu)
         window.close();
        else
         window.history.go(-1);