Changeset 321

Timestamp:

Apr 3, 2008 11:03:55 PM (16 years ago)

Author:

quinn

Message:

Update SortOrder? so it checks if setColumn has been run on a column before printing.

File:

• trunk/lib/SortOrder.inc.php (modified) (2 diffs)

trunk/lib/SortOrder.inc.php

@@ -162 +162 @@
     /**
      * Prints a link for a column header with URL sort determining logic.
+     * Column must be defined first using setColumn().
      *
      * @param string $col            The database column to sort by.
@@ -172 +173 @@
         $app =& App::getInstance();
 
-        if ($this->sort_by == $col) {
-            if (mb_strtolower($this->order) == 'desc') {
-                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=ASC'); ?>" title="<?php echo _("Change to ascending sort order"); ?>"><?php echo $this->desc_widget; ?></a><?php echo $col_name; ?><?php
+        if (isset($this->_columns[$col])) {
+            if ($this->sort_by == $col) {
+                if (mb_strtolower($this->order) == 'desc') {
+                    ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=ASC'); ?>" title="<?php echo _("Change to ascending sort order"); ?>"><?php echo $this->desc_widget; ?></a><?php echo $col_name; ?><?php
+                } else {
+                    ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=DESC'); ?>" title="<?php echo _("Change to descending sort order"); ?>"><?php echo $this->asc_widget; ?></a><?php echo $col_name; ?><?php
+                }
             } else {
-                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=DESC'); ?>" title="<?php echo _("Change to descending sort order"); ?>"><?php echo $this->asc_widget; ?></a><?php echo $col_name; ?><?php
-            }
+                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
+            }            
         } else {
-            ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
+            echo $col_name;
         }
     }