[Stack-cvs] stack-dev/opaque/moodleModule/stack block_stack.php, 1.8, 1.9

[Simon H. <sim...@us...>]

Update of /cvsroot/stack/stack-dev/opaque/moodleModule/stack
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28438/opaque/moodleModule/stack

Modified Files:
	block_stack.php 
Log Message:
Merging 2.2 branch
(with some additional fixes to ensure seamless updating for version lines)

Index: block_stack.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/moodleModule/stack/block_stack.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** block_stack.php	23 Jun 2009 16:18:28 -0000	1.8
--- block_stack.php	30 Sep 2010 16:56:15 -0000	1.9
***************
*** 67,70 ****
--- 67,76 ----
                  $this->content->icons[] = '<img src="'.$root.'/pix/i/switch.gif" class="icon" alt="Edit Question Options" />';
              }
+ 			/*
+             if (has_capability('moodle/question:viewmine', $context)) {
+                 $this->content->items[] = '<a href="'.$root.'/question/type/opaque/stack/soapPage.php?page=diagnostic">'.get_string('diagnostic', 'block_stack').'</a>';
+                 $this->content->icons[] = '<img src="'.$root.'/pix/i/outcomes.gif" class="icon" alt="Diagnostic Report" />';
+             }
+             */
          }
          else
***************
*** 86,88 ****
  
  }
! ?>
--- 92,94 ----
  
  }
! ?>
\ No newline at end of file