[geeklog-cvs] Geeklog-1.x/system lib-story.php,1.124,1.125

[Dirk Haun]

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

Modified Files:
	lib-story.php 
Log Message:
Fixes for E_ALL


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** lib-story.php	20 Feb 2008 20:23:00 -0000	1.124
--- lib-story.php	1 May 2008 21:01:47 -0000	1.125
***************
*** 1036,1040 ****
      }
  
!     $gl_edit = $args['gl_edit'];
      if ($gl_edit) {
          /* This is EDIT mode, so there should be an old sid */
--- 1036,1043 ----
      }
  
!     $gl_edit = false;
!     if (isset($args['gl_edit'])) {
!         $gl_edit = $args['gl_edit'];
!     }
      if ($gl_edit) {
          /* This is EDIT mode, so there should be an old sid */
***************
*** 1061,1067 ****
      }
  
      if (!empty($args['content'])) {
          $content = $args['content'];
!     } else {
          $content = $args['summary'];
      }   
--- 1064,1071 ----
      }
  
+     $content = '';
      if (!empty($args['content'])) {
          $content = $args['content'];
!     } else if (!empty($args['summary'])) {
          $content = $args['summary'];
      }   
***************
*** 1184,1188 ****
      $story = new Story();
  
!     if ($args['gl_edit'] && !empty($args['gl_etag'])) {
          /* First load the original story to check if it has been modified */
          $result = $story->loadFromDatabase($args['sid']);
--- 1188,1196 ----
      $story = new Story();
  
!     $gl_edit = false;
!     if (isset($args['gl_edit'])) {
!         $gl_edit = $args['gl_edit'];
!     }
!     if ($gl_edit && !empty($args['gl_etag'])) {
          /* First load the original story to check if it has been modified */
          $result = $story->loadFromDatabase($args['sid']);