Merge commit 'v7.10.23' into WebGUI8. Tests need fixing.

docs/changelog/7.x.x.txt

@@ -1,5 +1,20 @@
+7.10.23
+ - fixed #12225: Stock asset, multiple instances on a page
+ - fixed #12229: Indexed thingy data has gateway url prepended to it
+ - fixed #12195: Visitor group by scratch membership shared among all Visitors (Dale Trexel)
+ - fixed #12227: Corrected AssetReport such that OrderBy works correctly.
+ - fixed #12238: Old template attachement in search template slows down sites
+ - fixed #12239: Still get cart error message after removing extra recurring items from the cart
+ - fixed #12240: Empty Extend Calendar Recurrance version tags
+ - fixed #12241: Account Shop
+ - fixed #12246: Layout inherits mobileStyleTemplateId and mobileTemplateId from parent Layouts
+ - fixed #12246: added extra_www_add_properties as properties fix-up hook in child for www_add
+ - fixed #12231: Thingy reindex fails on upgrade
+ - fixed #12245: Encrypt Login and Display Message on Login conflict
+ - fixed #12211: Recurring Item error message in Cart
+
 7.10.22
- - rfe   #12223: Add dateTime type to content profiling (metadata)
+ - rfe   #12223: Add date type to content profiling (metadata)
  - rfe #12207: Thingy. Field_name info returned by www_editThingDataSaveViaAjax
  - fixed #12206: Bad Subscription Groups in Duplicated Threads
  - fixed #12208: replacements don't work

docs/gotcha.txt

@@ -31,6 +31,12 @@ save you many hours of grief.
        Account Macro template
        Admin Toggle Macro template
 
+7.10.23
+--------------------------------------------------------------------
+    * The default_search2 template had a bad template attachment pointing to 
+      an old WebGUI CSS Snippet called /webgui.css.  Any attachment with that
+      URL will be removed from ALL templates in the Search namespace.
+
 7.10.21
 --------------------------------------------------------------------
     * WebGUI now depends on Kwargs.

docs/legal.txt

@@ -2,7 +2,7 @@
 #                   WebGUI Legal Information                       #
 ####################################################################
 
-WebGUI is Copyright 2001-2009 Plain Black Corporation. All rights 
+WebGUI is Copyright 2001-2011 Plain Black Corporation. All rights 
 reserved.
 
 WebGUI Content Engine, WebGUI Runtime Environment, and Plain Black 

docs/upgrades/upgrade_7.10.22-7.10.23.pl

@@ -0,0 +1,141 @@
+#!/usr/bin/env perl
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+our ($webguiRoot);
+
+BEGIN {
+    $webguiRoot = "../..";
+    unshift (@INC, $webguiRoot."/lib");
+}
+
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Storage;
+use WebGUI::Asset;
+
+
+my $toVersion = '7.10.23';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+fixBadTemplateAttachments($session);
+
+finish($session); # this line required
+
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+#sub exampleFunction {
+#    my $session = shift;
+#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
+#    # and here's our code
+#    print "DONE!\n" unless $quiet;
+#}
+
+#----------------------------------------------------------------------------
+sub fixBadTemplateAttachments {
+    my $session = shift;
+    print "\tRemove template attachements in search templates that refer to an old, deleted CSS snippet... " unless $quiet;
+    # and here's our code
+    use WebGUI::Asset::Template;
+    my $get_template = WebGUI::Asset::Template->getIsa($session);
+    TEMPLATE: while (1) {
+        my $template = eval {$get_template->()};
+        next TEMPLATE if Exception::Class->caught;
+        last TEMPLATE unless $template;
+        next TEMPLATE unless $template->get('namespace') eq 'Search';
+        $template->removeAttachments(['^/(webgui.css);']);
+    }
+    print "DONE!\n" unless $quiet;
+}
+
+
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    print "\tUpgrading package $file\n" unless $quiet;
+    # Make a storage location for the package
+    my $storage     = WebGUI::Storage->createTemp( $session );
+    $storage->addFileFromFilesystem( $file );
+
+    # Import the package into the import node
+    my $package = eval {
+        my $node = WebGUI::Asset->getImportNode($session);
+        $node->importPackage( $storage, {
+            overwriteLatest    => 1,
+            clearPackageFlag   => 1,
+            setDefaultTemplate => 1,
+        } );
+    };
+
+    if ($package eq 'corrupt') {
+        die "Corrupt package found in $file.  Stopping upgrade.\n";
+    }
+    if ($@ || !defined $package) {
+        die "Error during package import on $file: $@\nStopping upgrade\n.";
+    }
+
+    return;
+}
+
+#-------------------------------------------------
+sub start {
+    my $configFile;
+    $|=1; #disable output buffering
+    GetOptions(
+        'configFile=s'=>\$configFile,
+        'quiet'=>\$quiet
+    );
+    my $session = WebGUI::Session->open($webguiRoot,$configFile);
+    $session->user({userId=>3});
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->set({name=>"Upgrade to ".$toVersion});
+    return $session;
+}
+
+#-------------------------------------------------
+sub finish {
+    my $session = shift;
+    updateTemplates($session);
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->commit;
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
+    $session->close();
+}
+
+#-------------------------------------------------
+sub updateTemplates {
+    my $session = shift;
+    return undef unless (-d "packages-".$toVersion);
+    print "\tUpdating packages.\n" unless ($quiet);
+    opendir(DIR,"packages-".$toVersion);
+    my @files = readdir(DIR);
+    closedir(DIR);
+    my $newFolder = undef;
+    foreach my $file (@files) {
+        next unless ($file =~ /\.wgpkg$/);
+        # Fix the filename to include a path
+        $file       = "packages-" . $toVersion . "/" . $file;
+        addPackage( $session, $file );
+    }
+}
+
+#vim:ft=perl