[geeklog-cvs] Geeklog-1.x/public_html/links index.php, 1.35, 1.36 portal.php, 1.8, 1.9

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/links
In directory qs1489.pair.com:/tmp/cvs-serv85563/public_html/links

Modified Files:
	index.php portal.php 
Log Message:
Ensure message display for "after save" option


Index: portal.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/portal.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** portal.php	23 May 2008 14:40:16 -0000	1.8
--- portal.php	24 May 2008 08:57:35 -0000	1.9
***************
*** 71,74 ****
--- 71,80 ----
  
      $item = COM_applyFilter(COM_getArgument('item'));
+     if (!empty($item)) {
+         // Hack: due to PLG_afterSaveSwitch settings, we may get
+         // an attached &msg - strip it off
+         $i = explode('&', $item);
+         $item = $i[0];
+     }
  
      if (!empty($item)) {

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** index.php	23 May 2008 14:40:16 -0000	1.35
--- index.php	24 May 2008 08:57:35 -0000	1.36
***************
*** 64,70 ****
  
  /**
! * create the links list depending on the category given
  *
- *  return       string      the links page
  */
  function links_list($message)
--- 64,72 ----
  
  /**
! * Create the links list depending on the category given
! *
! * @param    array   $message    message(s) to display
! * @return   string              the links page
  *
  */
  function links_list($message)
***************
*** 122,129 ****
  
      if (is_array($message) && !empty($message[0])) {
!         $display .= COM_startBlock ($message[0], '',
!                 COM_getBlockTemplate ('_msg_block', 'header'));
          $display .= $message[1];
!         $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
      }
  
--- 124,136 ----
  
      if (is_array($message) && !empty($message[0])) {
!         $display .= COM_startBlock($message[0], '',
!                                  COM_getBlockTemplate('_msg_block', 'header'));
          $display .= $message[1];
!         $display .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
!     } else if (isset($_REQUEST['msg'])) {
!         $msg = COM_applyFilter($_REQUEST['msg']);
!         if ($msg > 0) {
!             $display .= COM_showMessage($msg, 'links');
!         }
      }