Merge conflicts and kill a whole lot of trailing whitespace on lines.

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index f4245693fb8f7499dc22d5c952c3ee87068fe01a..1af5d1177005be22c2d242ca688e8180f8861125 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -95,7 +95,7 @@ function common_element_start($tag, $attrs=NULL) {
 function common_element_end($tag) {
        static $empty_tag = array('base', 'meta', 'link', 'hr',
                                                          'br', 'param', 'img', 'area',
-                                                         'input', 'col'); 
+                                                         'input', 'col');
        global $xw;
        # XXX: check namespace
        if (in_array($tag, $empty_tag)) {
@@ -460,7 +460,7 @@ function common_set_user($user) {
        } else if (!($user instanceof User)) {
                return false;
        }
-       
+
        if ($user) {
                common_ensure_session();
                $_SESSION['userid'] = $user->id;