[phpws-comm-commits] modules/article/class AM_EditForms.php, 1.10, 1.11 AM_Lists.php, 1.25, 1.26 AM_ModSettings.php, 1.14, NONE

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

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

Modified Files:
	AM_EditForms.php AM_Lists.php 
Removed Files:
	AM_ModSettings.php 
Log Message:
Setting changes weren't getting saved.  Fixed.

--- AM_ModSettings.php DELETED ---

Index: AM_EditForms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_EditForms.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AM_EditForms.php	21 Nov 2008 06:13:14 -0000	1.10
--- AM_EditForms.php	22 Nov 2008 06:41:54 -0000	1.11
***************
*** 628,631 ****
--- 628,632 ----
  
          PHPWS_Settings::set('article', $settings);
+         PHPWS_Settings::save('article');
          PHPWS_AM_Data::reset_cache();
      }

Index: AM_Lists.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AM_Lists.php	22 Nov 2008 00:43:57 -0000	1.25
--- AM_Lists.php	22 Nov 2008 06:41:54 -0000	1.26
***************
*** 228,233 ****
  			elseif ($publication_date > $now)
  				$status = dgettext('article', 'Upcoming Article');
! 			elseif (!$approved)
! 				$status = dgettext('article', 'Unapproved');
  			elseif ($mainarticle)
  				$status = dgettext('article', 'Featured Article');
--- 228,237 ----
  			elseif ($publication_date > $now)
  				$status = dgettext('article', 'Upcoming Article');
! 			elseif (!$approved) {
! 			    if ($draft)
! 			        $status = dgettext('article', 'Rough Draft');
! 				else
! 				    $status = dgettext('article', 'Unapproved');
! 			}
  			elseif ($mainarticle)
  				$status = dgettext('article', 'Featured Article');