[geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.116, 1.117

[Dirk Haun]

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

Modified Files:
	functions.inc 
Log Message:
Source code cosmetics, for consistency


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** functions.inc	20 Feb 2008 20:07:58 -0000	1.116
--- functions.inc	16 Mar 2008 09:33:23 -0000	1.117
***************
*** 45,64 ****
  
  if (file_exists($langfile)) {
!     include $langfile;
  } else {
!     include $plugin_path . 'language/english.php';
  }
  
! /* As of version 1.5 - plugins config.php is not needed and should be removed after upgrading */
! if (file_exists("{$plugin_path}config.php")) {
!    include $plugin_path . 'config.php';
  }
  
! // Check and see if we need to load the plugin configuration
  if (!isset($_SP_CONF['allow_php'])) {
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
      $sp_config = config::get_instance();
- 
      $_SP_CONF = $sp_config->get_config('staticpages');
  }
--- 45,68 ----
  
  if (file_exists($langfile)) {
!     require_once $langfile;
  } else {
!     require_once $plugin_path . 'language/english.php';
  }
  
! /*
! * As of Geeklog 1.5, the plugin's config.php is not needed any more and
! * should be removed after upgrading.
! */
! if (file_exists($plugin_path . 'config.php')) {
!     include_once $plugin_path . 'config.php';
  }
  
! /*
! * Check and see if we need to load the plugin configuration
! */
  if (!isset($_SP_CONF['allow_php'])) {
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
      $sp_config = config::get_instance();
      $_SP_CONF = $sp_config->get_config('staticpages');
  }