[geeklog-cvs] geeklog-1.3/system lib-plugins.php,1.49,1.50

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv4101/system

Modified Files:
	lib-plugins.php 
Log Message:
Added an option to disable autolinks


Index: lib-plugins.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** lib-plugins.php	23 Oct 2004 17:58:44 -0000	1.49
--- lib-plugins.php	13 Nov 2004 18:08:17 -0000	1.50
***************
*** 937,941 ****
  function PLG_collectTags ()
  {
!     global $_PLUGINS;
  
      // Determine which Core Modules and Plugins support AutoLinks
--- 937,946 ----
  function PLG_collectTags ()
  {
!     global $_CONF, $_PLUGINS;
! 
!     if (isset ($_CONF['disable_autolinks']) && ($_CONF['disable_autolinks'] == 1)) {
!         // autolinks are disabled - return an empty array
!         return array ();
!     }
  
      // Determine which Core Modules and Plugins support AutoLinks
***************
*** 975,978 ****
--- 980,988 ----
      global $_CONF, $_PLUGINS, $LANG32;
  
+     if (isset ($_CONF['disable_autolinks']) && ($_CONF['disable_autolinks'] == 1)) {
+         // autolinks are disabled - return $content unchanged
+         return $content;
+     }
+ 
      $autolinkModules = PLG_collectTags ();