Merge commit '808a866c8b' into webgui8. 7.9.4 release point

Conflicts:
	docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
	docs/upgrades/upgrade_7.9.2-7.9.3.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Gallery.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	t/Asset/Asset.t
This commit is contained in:
Colin Kuskie 2010-06-25 20:08:11 -07:00
commit b30491f3a6
31 changed files with 1974 additions and 415 deletions

View file

@ -104,7 +104,7 @@ installClass.pl -- Run class install methods
=head1 SYNOPSIS
installAsset.pl [--remove|--check|--upgrade] <class> --configFile=<configFile>
installClass.pl [--remove|--check|--upgrade] <class> --configFile=<configFile>
=head1 DESCRIPTION
@ -118,7 +118,7 @@ If your class has not told you to use this script, then it probably won't work!
=item class
The class name of the class to install. Something like WebGUI::Asset::Yourasset
The class name of the asset to install. Something like WebGUI::Asset::Yourasset
=back