[geeklog-cvs] Geeklog-1.x/system lib-story.php,1.107,1.108

[Dirk Haun]

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

Modified Files:
	lib-story.php 
Log Message:
Merged the internal '_draft' and '_draft_flag' variables into one (hopefully without breaking too much ...)


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** lib-story.php	17 Sep 2007 20:28:44 -0000	1.107
--- lib-story.php	30 Sep 2007 13:32:08 -0000	1.108
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-story.php                                                             |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-story.php                                                             |
***************
*** 962,967 ****
  * Delete a story.
  *
! * This is used to delete a story from the list of stories with the 'draft' flag
! * set (see function draftlist() above).
  *
  * @sid      string      ID of the story to delete
--- 962,966 ----
  * Delete a story.
  *
! * This is used to delete a story from the list of stories.
  *
  * @sid      string      ID of the story to delete
***************
*** 1110,1117 ****
          }
  
          if (isset($args['control'])) {
              foreach ($args['control'] as $key => $value) {
!                 if ($key == 'draft') {
!                     $args['draft'] = ($value == 'yes' ? 1 : 0);
                      break;
                  }
--- 1109,1117 ----
          }
  
+         // FIXME: move this to lib-webservices.php
          if (isset($args['control'])) {
              foreach ($args['control'] as $key => $value) {
!                 if ($key == 'draft') { // == 'app:draft'
!                     $args['draft_flag'] = ($value == 'yes' ? 1 : 0);
                      break;
                  }
***************
*** 1119,1124 ****
          }
  
!         if (!isset($args['draft'])) {
!             $args['draft'] = $_CONF['draft_flag'];
          }
  
--- 1119,1124 ----
          }
  
!         if (!isset($args['draft_flag'])) {
!             $args['draft_flag'] = $_CONF['draft_flag'];
          }