MDL-9825, MDL-9798, MDL-9799 - new workaround for the object trouble …

…in IE caused by UFO; reverting previous patches; merged from MOODLE_18_STABLE
janschrage · May 16, 2007 · 9eb64c9 · 9eb64c9
1 parent e835361
commit 9eb64c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/lib/ufo.js b/lib/ufo.js
@@ -271,10 +271,17 @@ var UFO = {
 		var _l = _o.length
 		for (var i = 0; i < _l; i++) {
 			_o[i].style.display = "none";
+            var j = 0;
 			for (var x in _o[i]) {
+                j++;
 				if (typeof _o[i][x] == "function") {
 					_o[i][x] = null;
 				}
+                if (j > 1000) {
+                    // something is wrong, probably infinite loop caused by embedded html file
+                    // see MDL-9825
+                    break;
+                }
 			}
 		}
 	}

diff --git a/theme/index.php b/theme/index.php
@@ -124,12 +124,10 @@
             echo '</ul>';
         }
 
-        // can not use forms due to object bug in IE :-( see MDL-9799
-/*        $options = null;
+        $options = null;
         $options['choose'] = $theme;
         $options['sesskey'] = $sesskey;
-        print_single_('index.php', $options, $strchoose);*/
-        echo '<a href="index.php?choose='.$theme.'&amp;sesskey='.sesskey().'">'.$strchoose.'</a>';
+        print_single_button('index.php', $options, $strchoose);
         echo '</td>';
         echo "</tr>";
     }

diff --git a/user/policy.php b/user/policy.php
@@ -49,20 +49,11 @@
     echo '<a href="'.$CFG->sitepolicy.'" onclick="this.target=\'_blank\'">'.$strpolicyagreementclick.'</a>';
     echo '</object></div>';
 
-  // see MDL-9798
-/*    $linkyes    = 'policy.php';
+    $linkyes    = 'policy.php';
     $optionsyes = array('agree'=>1, 'sesskey'=>sesskey());
     $linkno     = $CFG->wwwroot.'/login/logout.php';
     $optionsno  = array('sesskey'=>sesskey());
-    notice_yesno($strpolicyagree, $linkyes, $linkno, $optionsyes, $optionsno);*/
-
-    print_box_start('generalbox', 'notice');
-    echo '<p>'. $strpolicyagree .'</p>';
-    echo '<div class="buttons">';
-    echo '<div class="singlebutton"><a href="policy.php?agree=1&amp;sesskey='.sesskey().'">'.get_string('yes').'</a></div>';
-    echo '<div class="singlebutton"><a href="../login/logout.php?sesskey='.sesskey().'">'.get_string('no').'</a></div>';
-    echo '</div>';
-    print_box_end();
+    notice_yesno($strpolicyagree, $linkyes, $linkno, $optionsyes, $optionsno);
 
     print_footer();