Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/jason/dev/git/wfpl
[wfpl.git]
/
format.php
diff --git
a/format.php
b/format.php
index
bb34919
..
99a67b7
100644
(file)
--- a/
format.php
+++ b/
format.php
@@
-33,8
+33,11
@@
function format_options($str, $name) {
die("Couldn't find options for \"$name\". Be sure to call pulldown().");
}
die("Couldn't find options for \"$name\". Be sure to call pulldown().");
}
- if(!in_array($str, array_keys($GLOBALS[$name . '_options']['options']))) {
- return '';
+ foreach($GLOBALS[$name . '_options']['options'] as $keyval) {
+ list($key, $value) = $keyval;
+ if($str == $key) {
+ return $str;
+ }
}
return $str;
}
return $str;
@@
-109,7
+112,7
@@
function format_yesno($str) {
function format_email($str) {
# FIXME
function format_email($str) {
# FIXME
- return format_oneline($str);
+ return trim(format_oneline($str));
}
function format_url($str) {
}
function format_url($str) {