Changeset 289 for branches/1.1dev/lib/TemplateGlue.inc.php

Timestamp:

Nov 3, 2007 1:35:13 AM (17 years ago)

Author:

quinn

Message:

Modifications made for tilecity site.

File:

• branches/1.1dev/lib/TemplateGlue.inc.php (modified) (2 diffs)

branches/1.1dev/lib/TemplateGlue.inc.php

@@ -65 +65 @@
     $row = mysql_fetch_row($qid);
     if (preg_match('/^enum|^set/i', $row[1]) && preg_match_all("/'([^']*)'/", $row[1], $enum)) {
+        natsort($enum[1]);
         return $enum[1];
     } else {
@@ -292 +293 @@
         }
     }
-    $qid = dbQuery("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    $key_column_name = preg_replace('/^.*?\.?([^\.]+)$/', '$1', $key_column);
+    $val_column_name = preg_replace('/^.*?\.?([^\.]+)$/', '$1', $val_column);
+    $qid = dbQuery("SELECT $key_column AS `$key_column_name`, $val_column AS `$val_column_name` FROM $db_table $extra_clause",false);
     while ($row = mysql_fetch_assoc($qid)) {
-        $selected = in_array($row[$val_column], $preselected) ? ' selected="selected"' : '';
-        ?><option value="<?php echo $row[$val_column]; ?>"<?php echo $selected; ?>><?php echo oTxt($row[$key_column]); ?></option><?php
+        $selected = in_array($row[$val_column_name], $preselected) ? ' selected="selected"' : '';
+        ?><option value="<?php echo $row[$val_column_name]; ?>"<?php echo $selected; ?>><?php echo oTxt($row[$key_column_name]); ?></option><?php
     }
 }