[geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.10, 1.11

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv66090

Modified Files:
	config.class.php 
Log Message:
updates to support plugins using the config manager.

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.class.php	30 Dec 2007 00:11:40 -0000	1.10
--- config.class.php	30 Dec 2007 03:07:07 -0000	1.11
***************
*** 107,111 ****
          }
          $this->_post_configuration();
!         
          return $this->config_array;
      }
--- 107,111 ----
          }
          $this->_post_configuration();
! 
          return $this->config_array;
      }
***************
*** 347,350 ****
--- 347,351 ----
  
          if (count($groups) > 0) {
+             $t->set_block('menugroup','subgroup-selector','subgroups');
              foreach ($groups as $group) {
                  $t->set_var("select_id", ($group === $grp ? 'id="current"' : ''));
***************
*** 352,356 ****
                  $t->set_var("group_display", ucwords($group));
                  $subgroups = $this->get_sgroups($group);
!                 $t->set_block('menugroup','subgroup-selector','subgroups');
                  foreach ($subgroups as $sgroup) {
                      $t->set_var('select_id', ($sg === $sgroup ? 'id="current"' : ''));
--- 353,357 ----
                  $t->set_var("group_display", ucwords($group));
                  $subgroups = $this->get_sgroups($group);
!                 $i=1;
                  foreach ($subgroups as $sgroup) {
                      $t->set_var('select_id', ($sg === $sgroup ? 'id="current"' : ''));
***************
*** 358,365 ****
                      $t->set_var("subgroup_display_name",
                                  $LANG_configsubgroups[$group][$sgroup]);
!                     $t->parse('subgroups', "subgroup-selector", true);
                  }
                  $t->parse("menu_elements", "menugroup", true);
- 
              }
          } else {
--- 359,370 ----
                      $t->set_var("subgroup_display_name",
                                  $LANG_configsubgroups[$group][$sgroup]);
!                     if ($i == 1) {
!                         $t->parse('subgroups', "subgroup-selector");
!                     } else {
!                         $t->parse('subgroups', "subgroup-selector", true);
!                     }
!                     $i++;
                  }
                  $t->parse("menu_elements", "menugroup", true);
              }
          } else {
***************
*** 369,372 ****
--- 374,378 ----
          $t->set_block('main','fieldset','sg_contents');
          $t->set_block('fieldset', 'notes', 'fs_notes');
+ 
          $ext_info = $this->_get_extended($sg, $grp);
          foreach ($ext_info as $fset=>$params) {