[geeklog-cvs] Geeklog-1.x/public_html/admin/install config-install.php, 1.21, 1.22

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv44585/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Have the config data for the Static Pages plugin in only one place


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** config-install.php	27 Jan 2008 10:53:03 -0000	1.21
--- config-install.php	2 Feb 2008 16:36:34 -0000	1.22
***************
*** 38,42 ****
  function install_config()
  {
!     global $_TABLES;
  
      $c = config::get_instance();
--- 38,42 ----
  function install_config()
  {
!     global $_CONF, $_TABLES;
  
      $c = config::get_instance();
***************
*** 230,245 ****
  
      // Add the configuration records for the default installed plugins
!     $c->add('allow_php', 1, 'select', 0, 0, 0, 10, true, 'staticpages');
!     $c->add('sort_by', 'id', 'select', 0, 0, 2, 20, true, 'staticpages');
!     $c->add('sort_menu_by', 'label', 'select', 0, 0, 3, 30, true, 'staticpages');
!     $c->add('delete_pages', 0, 'select', 0, 0, 0, 40, true, 'staticpages');
!     $c->add('in_block', 1, 'select', 0, 0, 0, 50, true, 'staticpages');
!     $c->add('show_hits', 1, 'select', 0, 0, 0, 60, true, 'staticpages');
!     $c->add('show_date', 1, 'select', 0, 0, 0, 70, true, 'staticpages');
!     $c->add('filter_html', 0, 'select', 0, 0, 0, 80, true, 'staticpages');
!     $c->add('censor', 1, 'select', 0, 0, 0, 90, true, 'staticpages');
!     $c->add('aftersave', 'item', 'select', 0, 0, 9, 100, true, 'staticpages');
!     $c->add('atom_max_items', 10, 'text', 0, 0, null, 110, true, 'staticpages');
!     $c->add('default_permissions', array(3,2,2,2), '@select', 0, 1, 12, 120, true, 'staticpages');
  
      $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');
--- 230,239 ----
  
      // Add the configuration records for the default installed plugins
!     $plugin_path = $_CONF['path'] . 'plugins/';
! 
!     require_once $plugin_path . 'staticpages/install_defaults.php';
! 
!     plugin_initconfig_staticpages();
! 
  
      $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');