tweak unary operator display to avoid extra spaces

diff --git a/libraries/decorator.inc.php b/libraries/decorator.inc.php
index 2717013571bbed218064851dc12af084cb12ea16..aa4e5c36557fcb8b56d4f908939a0c04ac9ae16a 100644 (file)
--- a/libraries/decorator.inc.php
+++ b/libraries/decorator.inc.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: decorator.inc.php,v 1.3 2005/05/04 10:07:21 jollytoad Exp $
+// $Id: decorator.inc.php,v 1.4 2005/09/03 04:59:59 chriskl Exp $
 
 // This group of functions and classes provides support for
 // resolving values in a lazy manner (ie, as and when required)
@@ -152,7 +152,7 @@ class ConcatDecorator extends Decorator
                foreach($this->c as $var) {
                        $accum .= value($var, $fields);
                }
-               return $accum;
+               return trim($accum);
        }
 }
 

diff --git a/operators.php b/operators.php
index 5130a8154eb22b3630a56ad487da4459bb63bef9..3b6379f48501a7f6fb6dccf009ac08e0ed2b3adf 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.18 2005/05/02 15:47:24 chriskl Exp $
+        * $Id: operators.php,v 1.19 2005/09/03 04:59:59 chriskl Exp $
         */
 
        // Include application functions
@@ -167,9 +167,6 @@
                // Operator prototype: "type operator type"
                $proto = concat(field('oprleftname'), ' ', field('oprname'), ' ', field('oprrightname'));
                
-               // Alternative prototype: "operator (type,type)"
-               #$proto = concat(field('oprname'), ' (', field('oprleftname','NONE'), ',', field('oprrightname','NONE'), ')');
-               
                $reqvars = $misc->getRequestVars('operator');
                
                $attrs = array(