Fixed tabbed_content behaviour.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1faa3256888b3251c24ff2359828cd4e26a9dd36..f967533b4638b4e8d3e60da4824a5fb2e6d59c28 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,6 +23,8 @@ $ -> Affected files
 ! Release 2.3RC3
 25-Oct-2010 Janusz Dobrowolski
 $ version.php
+# Small fix to tabbed_content behaviour.
+$ /includes/ui/ui_controls.inc
 
 22-Oct-2010 Janusz Dobrowolski
 + Added greek installer translation by Kyriakos Tsoukalas

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 43b7fd8146230ac77e6e2c8ba9ba6b68932bc2f1..a6fd2ef6f1e4d36757940b2227334a294b5edd6c 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -379,14 +379,13 @@ function tabbed_content_start($name, $tabs, $dft='') {
     $selname = '_'.$name.'_sel';
        $div = '_'.$name.'_div';
 
-       if ($dft=='')
-               $dft = key($tabs);
-    $sel = find_submit($name.'_', '');
+       $sel = find_submit($name.'_', false);
+       if($sel==null)
+               $sel = get_post($selname, (string)($dft==='' ? key($tabs) : $dft));
+
+       if ($sel!==@$_POST[$selname])
+               $Ajax->activate($name);
 
-       if ($sel != '') {
-                       $Ajax->activate($name);
-       } else 
-               $sel = get_post($selname, $dft);
        $_POST[$selname] = $sel;
 
        div_start($name);
@@ -397,7 +396,7 @@ function tabbed_content_start($name, $tabs, $dft='') {
                $disabled = (is_array($tab) && !$tab[1])  ? 'disabled ' : '';
                $str .= ( "<li>"
                        ."<button type='submit' name='{$name}_".$tab_no
-                       ."' class='".($tab_no===$sel ? 'current':'ajaxbutton')."' $acc[1] $disabled>"
+                       ."' class='".((string)$tab_no===$sel ? 'current':'ajaxbutton')."' $acc[1] $disabled>"
                        ."<span>$acc[0]</span>"
                        ."</button>\n"
                        ."</li>\n" );