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

[Dirk Haun]

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

Modified Files:
	story.class.php 
Log Message:
E_ALL fixes


Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** story.class.php	12 Jul 2008 12:51:18 -0000	1.32
--- story.class.php	27 Jul 2008 18:10:10 -0000	1.33
***************
*** 1667,1671 ****
          // SID's are a special case:
          $sid = COM_sanitizeID($array['sid']);
!         $oldsid = COM_sanitizeID($array['old_sid']);
  
          if (empty($sid)) {
--- 1667,1675 ----
          // SID's are a special case:
          $sid = COM_sanitizeID($array['sid']);
!         if (isset($array['old_sid'])) {
!             $oldsid = COM_sanitizeID($array['old_sid'], false);
!         } else {
!             $oldsid = '';
!         }
  
          if (empty($sid)) {
***************
*** 1681,1688 ****
  
          /* Need to deal with the postdate and expiry date stuff */
!         $publish_ampm = COM_applyFilter($array['publish_ampm']);
!         $publish_hour = COM_applyFilter($array['publish_hour'], true);
!         $publish_minute = COM_applyFilter($array['publish_minute'], true);
!         $publish_second = COM_applyFilter($array['publish_second'], true);
  
          if ($publish_ampm == 'pm') {
--- 1685,1704 ----
  
          /* Need to deal with the postdate and expiry date stuff */
!         $publish_ampm = '';
!         if (isset($array['publish_ampm'])) {
!             $publish_ampm = COM_applyFilter($array['publish_ampm']);
!         }
!         $publish_hour = 0;
!         if (isset($array['publish_hour'])) {
!             $publish_hour = COM_applyFilter($array['publish_hour'], true);
!         }
!         $publish_minute = 0;
!         if (isset($array['publish_minute'])) {
!             $publish_minute = COM_applyFilter($array['publish_minute'], true);
!         }
!         $publish_second = 0;
!         if (isset($array['publish_second'])) {
!             $publish_second = COM_applyFilter($array['publish_second'], true);
!         }
  
          if ($publish_ampm == 'pm') {
***************
*** 1696,1702 ****
          }
  
!         $publish_year = COM_applyFilter($array['publish_year'], true);
!         $publish_month = COM_applyFilter($array['publish_month'], true);
!         $publish_day = COM_applyFilter($array['publish_day'], true);
          $this->_date = strtotime(
                             "$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second");
--- 1712,1727 ----
          }
  
!         $publish_year = 0;
!         if (isset($array['publish_year'])) {
!             $publish_year = COM_applyFilter($array['publish_year'], true);
!         }
!         $publish_month = 0;
!         if (isset($array['publish_month'])) {
!             $publish_month = COM_applyFilter($array['publish_month'], true);
!         }
!         $publish_day = 0;
!         if (isset($array['publish_day'])) {
!             $publish_day = COM_applyFilter($array['publish_day'], true);
!         }
          $this->_date = strtotime(
                             "$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second");