[geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.18, 1.19

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv76893/system/classes

Modified Files:
	story.class.php 
Log Message:
Fixed regression: {contributedby_photo} didn't work any more. Also made it available as {author_photo} now, for consistency with the comment templates.


Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** story.class.php	25 Nov 2007 06:59:56 -0000	1.18
--- story.class.php	22 Dec 2007 14:38:30 -0000	1.19
***************
*** 139,142 ****
--- 139,143 ----
      var $_fullname;
      var $_photo;
+     var $_email;
      var $_topic;
      var $_imageurl;
***************
*** 202,206 ****
             'imageurl' => 0,
             'topic' => 0,
!            'access' => 0
           );
      /**
--- 203,209 ----
             'imageurl' => 0,
             'topic' => 0,
!            'access' => 0,
!            'photo' => 0,
!            'email' => 0
           );
      /**
***************
*** 399,403 ****
          } elseif (!empty($sid) && ($mode == 'editsubmission')) {
              $sql = 'SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) AS unixdate, '
!                 . 'u.username, u.fullname, u.photo, t.topic, t.imageurl, t.group_id, ' . 't.perm_owner, t.perm_group, t.perm_members, t.perm_anon ' . 'FROM ' . $_TABLES['storysubmission'] . ' AS s, ' . $_TABLES['users'] . ' AS u, ' . $_TABLES['topics'] . ' AS t WHERE (s.uid = u.uid) AND' . ' (s.tid = t.tid) AND (sid = \'' . $sid . '\')';
          } elseif ($mode == 'edit') {
              $this->_sid = COM_makesid();
--- 402,406 ----
          } elseif (!empty($sid) && ($mode == 'editsubmission')) {
              $sql = 'SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) AS unixdate, '
!                 . 'u.username, u.fullname, u.photo, u.email, t.topic, t.imageurl, t.group_id, ' . 't.perm_owner, t.perm_group, t.perm_members, t.perm_anon ' . 'FROM ' . $_TABLES['storysubmission'] . ' AS s, ' . $_TABLES['users'] . ' AS u, ' . $_TABLES['topics'] . ' AS t WHERE (s.uid = u.uid) AND' . ' (s.tid = t.tid) AND (sid = \'' . $sid . '\')';
          } elseif ($mode == 'edit') {
              $this->_sid = COM_makesid();