Changes in inc/core/class.dc.core.php [1593:0c884219a872:1698:add60e1e9451]

File:

• inc/core/class.dc.core.php (modified) (4 diffs)

inc/core/class.dc.core.php

@@ -345 +345 @@
      }
      
-     public function setPostType($type,$admin_url,$public_url)
+     public function setPostType($type,$admin_url,$public_url,$label='')
      {
           $this->post_types[$type] = array(
                'admin_url' => $admin_url,
-               'public_url' => $public_url
+               'public_url' => $public_url,
+               'label' => ($label != '' ? $label : $type)
           );
      }
@@ -817 +818 @@
           $strReq =
           'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '.
-          'user_displayname, permissions '.
+          'user_displayname, user_email, permissions '.
           'FROM '.$this->prefix.'user U '.
           'JOIN '.$this->prefix.'permissions P ON U.user_id = P.user_id '.
@@ -826 +827 @@
                'UNION '.
                'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '.
-               "user_displayname, NULL AS permissions ".
+               "user_displayname, user_email, NULL AS permissions ".
                'FROM '.$this->prefix.'user U '.
                'WHERE user_super = 1 ';
@@ -841 +842 @@
                     'firstname' => $rs->user_firstname,
                     'displayname' => $rs->user_displayname,
+                    'email' => $rs->user_email,
                     'super' => (boolean) $rs->user_super,
                     'p' => $this->auth->parsePermissions($rs->permissions)