[geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.118, 1.119

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv16170/plugins/staticpages

Modified Files:
	functions.inc 
Log Message:
Prevent recursive calls of [staticpage_content:]


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** functions.inc	17 Mar 2008 21:12:54 -0000	1.118
--- functions.inc	6 Apr 2008 17:26:02 -0000	1.119
***************
*** 988,991 ****
--- 988,993 ----
      global $_CONF, $_TABLES;
  
+     static $recursive = array();
+ 
      if ($op == 'tagname' ) {
          return array('staticpage', 'staticpage_content');
***************
*** 1005,1009 ****
          } else if ($autotag['tag'] == 'staticpage_content') {
              $sp_id = COM_applyFilter ($autotag['parm1']);
!             $content = SP_returnStaticpage($sp_id, 'autotag');
          }
  
--- 1007,1016 ----
          } else if ($autotag['tag'] == 'staticpage_content') {
              $sp_id = COM_applyFilter ($autotag['parm1']);
!             if (isset($recursive[$sp_id])) {
!                 $content = '';
!             } else {
!                 $recursive[$sp_id] = true;
!                 $content = SP_returnStaticpage($sp_id, 'autotag');
!             }
          }