[ 1274414 ] extraHeadTags entirely unused

docs/changelog/6.x.x.txt

@@ -3,6 +3,7 @@
  - Fixed a bug in the user manager where userId, date created, date updated,
    and karma were not showing up when editing users.
  - fix [ 1274239 ] Can Not Save Edits to Assets
+ - fix [ 1274414 ] extraHeadTags entirely unused (mwilson)
 
 
 6.7.2

lib/WebGUI/Asset.pm

@@ -661,6 +661,20 @@ sub getEditForm {
 }
 
 
+#-------------------------------------------------------------------
+
+=head2 getExtraHeadTags (  )
+
+Returns the extraHeadTags stored in the asset.  Called in WebGUI::Style::generateAdditionalHeadTags if this asset is the $session{asset}.  Also called in WebGUI::Layout::view for its child assets.  Overriden in Shortcut.pm.
+
+=cut
+
+sub getExtraHeadTags {
+	my $self = shift;
+	return $self->get("extraHeadTags");
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 getIcon ( [small] )

lib/WebGUI/Asset/Shortcut.pm

@@ -189,6 +189,19 @@ sub getEditForm {
 }
 
 
+#-------------------------------------------------------------------
+
+=head2 getExtraHeadTags (  )
+
+Returns the extraHeadTags stored in the asset.  Called in WebGUI::Style::generateAdditionalHeadTags if this asset is the $session{asset}.  Also called in WebGUI::Layout::view for its child assets.  Overriden here in Shortcut.pm.
+
+=cut
+
+sub getExtraHeadTags {
+	my $self = shift;
+	return $self->get("extraHeadTags")."\n".$self->getShortcut->get("extraHeadTags");
+}
+
 
 #-------------------------------------------------------------------
 sub getShortcut {

lib/WebGUI/Asset/Wobject/Layout.pm

@@ -155,6 +155,7 @@ sub view {
 			foreach my $child (@{$children}) {
 				if ($asset eq $child->getId) {
 					unless (isIn($asset,@hidden) || !($child->canView)) {
+						WebGUI::Style::setRawHeadTags($child->getExtraHeadTags);
 						if ($i > $numPositions) {
 							push(@{$vars{"position1_loop"}},{
 								id=>$child->getId,

lib/WebGUI/Style.pm

@@ -53,7 +53,7 @@ These subroutines are available from this package:
 
 =head2 generateAdditionalHeadTags ( )
 
-Creates tags that were set using setLink, setMeta, setScript, and setRawHeadTags.
+Creates tags that were set using setLink, setMeta, setScript, extraHeadTags, and setRawHeadTags.
 
 =cut
 
@@ -84,6 +84,9 @@ sub generateAdditionalHeadTags {
 		}
 		$tags .= ' />'."\n";
 	}
+	# append extraHeadTags
+	$tags .= $session{asset}->getExtraHeadTags."\n";
+	
 	delete $session{page}{head};
 	return $tags;
 }