MDL-11370 :: added a global var $THEME->customcornersopen to track properly closed...

diff --git a/lib/custom_corners_lib.php b/lib/custom_corners_lib.php
index 47bcf641c3f808a145ab48d3ccfd6455b1746e9d..dbabc054670362f75208061f64588f183b8b3f34 100755 (executable)
--- a/lib/custom_corners_lib.php
+++ b/lib/custom_corners_lib.php
@@ -17,6 +17,7 @@
  * @param mixed   $idbase, optionally, define one idbase to be added to all the elements in the corners
  */
 function print_custom_corners_start($clearfix=false, $return=false, $idbase=null) {
+    global $THEME;
 
 /// Analise if we want ids for the custom corner elements
     $idbt = '';
@@ -37,7 +38,9 @@ function print_custom_corners_start($clearfix=false, $return=false, $idbase=null
     $output .= "\n";
     $output .= '<div '.$idi1.'class="i1"><div '.$idi2.'class="i2">';
     $output .= (!empty($clearfix)) ? '<div '.$idi3.'class="i3 clearfix">' : '<div '.$idi3.'class="i3">';
-
+    
+    $THEME->customcornersopen += 1;
+    
     if ($return) {
         return $output;
     } else {
@@ -53,6 +56,7 @@ function print_custom_corners_start($clearfix=false, $return=false, $idbase=null
  * @param mixed   $idbase, optionally, define one idbase to be added to all the elements in the corners
  */
 function print_custom_corners_end($return=false, $idbase=null) {
+    global $THEME;
 
 /// Analise if we want ids for the custom corner elements
     $idbb = '';
@@ -66,7 +70,9 @@ function print_custom_corners_end($return=false, $idbase=null) {
     $output .= "\n";
     $output .= '<div '.$idbb.'class="bb"><div>&nbsp;</div></div>'."\n";
     $output .= '</div>';
-
+    
+    $THEME->customcornersopen -= ($THEME->customcornersopen > 0) ? 1 : 0;
+    
     if ($return) {
         return $output;
     } else {

diff --git a/lib/weblib.php b/lib/weblib.php
index b944564c34d14770da7224b235535b1058125f6a..2835866b9cdace23fb87531a9438774baa85c734 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2665,6 +2665,13 @@ function print_footer($course=NULL, $usercourse=NULL, $return=false) {
         }
     }
 
+/// Close eventually open custom_corner divs
+    if ((!empty($THEME->customcorners)) && ($THEME->customcornersopen > 1)) {
+        require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
+        while ($THEME->customcornersopen > 1) {
+            print_custom_corners_end();
+        }
+    }
 
 /// Include the actual footer file
 
@@ -5948,6 +5955,7 @@ function print_side_block_start($heading='', $attributes = array()) {
     if (!empty($THEME->customcorners)) {
         echo '<div class="i1"><div class="i2">';
         echo '<div class="i3">';
+        $THEME->customcornersopen += 1;
     }
     echo '<div class="content">';