Merge pull request #1157 from UniversityRadioYork/rens-updates

didn't catch these break search. I will remove them for now
UniversityRadioYork · Aug 26, 2024 · c1eb331 · c1eb331
2 parents a124897 + f7979ec
commit c1eb331
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Classes/MyRadio/MyRadioNews.php b/src/Classes/MyRadio/MyRadioNews.php
@@ -75,7 +75,7 @@ public static function getNewsItem($newsentryid, MyRadio_User $user = null)
         $db = Database::getInstance();
 
         $news = $db->fetchOne(
-            'SELECT newsentryid, fname || \' \' || sname AS author, fname || \' "\' || nname || \'" \' || sname as nickname, timestamp AS posted, content
+            'SELECT newsentryid, fname || \' \' || sname AS author, timestamp AS posted, content
             FROM public.news_feed, public.member
             WHERE newsentryid=$1
             AND news_feed.memberid = member.memberid',

diff --git a/src/Classes/ServiceAPI/Profile.php b/src/Classes/ServiceAPI/Profile.php
@@ -83,7 +83,7 @@ public static function getMembersForYear($year)
         */ 
 
         $result = self::$db->fetchAll(
-            'SELECT member.memberid, CONCAT(fname, \', \' ,sname)  AS name,  fname || \' "\' || nname || \'" \' || sname AS nickname, l_college.descr AS college, paid, email, eduroam
+            'SELECT member.memberid, CONCAT(fname, \', \' ,sname)  AS name, l_college.descr AS college, paid, email, eduroam
             FROM member INNER JOIN (SELECT * FROM member_year WHERE year = $1) AS member_year
             ON ( member.memberid = member_year.memberid ), l_college
             WHERE member.college = l_college.collegeid