[phpws-comm-commits] modules/article index_admin.php,1.18,1.19

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25974

Modified Files:
	index_admin.php 
Log Message:
Updated Approval db access method to work with phpWS 1.6

Index: index_admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** index_admin.php	21 Aug 2008 20:17:21 -0000	1.18
--- index_admin.php	10 Oct 2008 03:59:43 -0000	1.19
***************
*** 65,69 ****
  			$title = dgettext('article', 'This is a preview of edits to this article.');
      }
!     elseif ($version->vr_current && Current_User::allow('article', 'edit_articles', $article->id)) {
  	    $vars['edit'] = 'view';
  	    $options[] = PHPWS_Text::secureLink(dgettext('article', 'Edit'), 'article', $vars);
--- 65,69 ----
  			$title = dgettext('article', 'This is a preview of edits to this article.');
      }
!     elseif ($version->vr_current && (Current_User::allow('article', 'edit_articles', $article->id) || (Current_User::getId() && $article->created_id == Current_User::getId()))) {
  	    $vars['edit'] = 'view';
  	    $options[] = PHPWS_Text::secureLink(dgettext('article', 'Edit'), 'article', $vars);
***************
*** 414,419 ****
  	$approval->columns = PHPWS_Article::get_summary_columns();
      /* Don't pull up any rough drafts or deleteds */
!     $approval->_db->addWhere('draft', 0);
!     $approval->_db->addWhere('active', 1);
  	$content = $approval->getList();
  break;
--- 414,419 ----
  	$approval->columns = PHPWS_Article::get_summary_columns();
      /* Don't pull up any rough drafts or deleteds */
!     $approval->addWhere('draft', 0);
!     $approval->addWhere('active', 1);
  	$content = $approval->getList();
  break;
***************
*** 695,699 ****
  			/* No versions?!?! Load the article. */
  			$article = & new PHPWS_Article((int) $_REQUEST['id']);
! 		if (!Current_User::allow('article', 'edit_articles', $article->id)) {
  	        Current_User::disallow(dgettext('article', 'User tried to edit an article.'));
  	        return false;
--- 695,699 ----
  			/* No versions?!?! Load the article. */
  			$article = & new PHPWS_Article((int) $_REQUEST['id']);
! 		if (!(Current_User::allow('article', 'edit_articles', $article->id) || (Current_User::getId() && $article->created_id == Current_User::getId()))) {
  	        Current_User::disallow(dgettext('article', 'User tried to edit an article.'));
  	        return false;