Ver código fonte

Merge branch 'master' of github.com:Troglodyne-Internet-Widgets/tCMS

George Baugh 1 ano atrás
pai
commit
b0cf8d39ed
2 arquivos alterados com 2 adições e 2 exclusões
  1. 1 1
      lib/TCMS.pm
  2. 1 1
      schema/auth.schema

+ 1 - 1
lib/TCMS.pm

@@ -345,7 +345,7 @@ sub _app {
 }
 
 #XXX Return a clone of the routing table ref, because code modifies it later
-sub _routes ($data) {
+sub _routes ($data={}) {
     state %routes;
     return clone(\%routes) if %routes;
 

+ 1 - 1
schema/auth.schema

@@ -29,4 +29,4 @@ CREATE TABLE IF NOT EXISTS change_request (
     processed NUMERIC DEFAULT 0
 );
 
-CREATE VIEW IF NOT EXISTS change_request_full AS SELECT cr.username, cr.type, cr.token, cr.secret, cr.processed, u.contact_email from change_request AS cr JOIN user AS u ON u.name=cr.username;
+CREATE VIEW IF NOT EXISTS change_request_full AS SELECT cr.username, u.display_name, cr.type, cr.token, cr.secret, cr.processed, u.contact_email from change_request AS cr JOIN user AS u ON u.name=cr.username;