Clean up previous commit

composer.json

@@ -36,7 +36,7 @@
 
         "nesbot/carbon" : "2.68.1",
 
-        "tsugi/lib": "dev-master#a31404f87efd9c134f72c6197c0514c162993c57",
+        "tsugi/lib": "dev-master#715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc",
         "koseu/lib": "dev-master#70c7ac1ca413c2dd541e078ebe07719405621b1b"
     },
     "config": {

vendor/composer/installed.json

@@ -7511,12 +7511,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/tsugiproject/tsugi-php.git",
-                "reference": "a31404f87efd9c134f72c6197c0514c162993c57"
+                "reference": "715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/a31404f87efd9c134f72c6197c0514c162993c57",
-                "reference": "a31404f87efd9c134f72c6197c0514c162993c57",
+                "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc",
+                "reference": "715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc",
                 "shasum": ""
             },
             "require": {

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '86b1fc5e88a4aa682d66d90737a4e464151a88c4',
+        'reference' => '770e466467c7313153a101a2593a8d45f610e61c',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '86b1fc5e88a4aa682d66d90737a4e464151a88c4',
+            'reference' => '770e466467c7313153a101a2593a8d45f610e61c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -1045,7 +1045,7 @@
         'tsugi/lib' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'a31404f87efd9c134f72c6197c0514c162993c57',
+            'reference' => '715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../tsugi/lib',
             'aliases' => array(

vendor/tsugi/lib/src/Config/ConfigInfo.php

@@ -146,46 +146,17 @@ class ConfigInfo {
     /**
      * Support memcache for session caching
      *
-     * Memcache is php-only and so is likely to require less overall dependencies.
+     * Store sessions in memcache - this seems like the fastest, best, and simplest approach
+     * when running on AWS.
      *
-     * http://php.net/manual/en/memcache.sessions.php
-     *
-     * Installed on Ubuntu using
-     *
-     * apt-get install -y php${TSUGI_PHP_VERSION}-memcache
+     * http://php.net/manual/en/memcached.sessions.php
      *
-     * You should only select one of memcache and memcached
+     * Note - prefer "memcache" over "memcached"
      *
      * $CFG->memcache = 'tcp://memcache-tsugi.4984vw.cfg.use2.cache.amazonaws.com:11211';
-     *
-     * In addition to setting this variable, your config.php must include the code
-     * to configure the PHP session save handler as shown in config-dist.php
-     *
      */
     public $memcache;
 
-    /**
-     * Support memcached for session caching
-     *
-     * Memcached is a combination of PHP and C and so may require extra dependencies.
-     *
-     * http://php.net/manual/en/memcached.sessions.php
-     *
-     * Installed on Ubuntu using
-     *
-     * apt-get install -y php${TSUGI_PHP_VERSION}-memcached
-     *
-     * You should only select one of memcache and memcached
-     *
-     * $CFG->memcached = 'memcache-tsugi.4984vw.cfg.use2.cache.amazonaws.com:11211';
-     *
-     * Note no "tcp://" for the memcached version of the url
-     *
-     * In addition to setting this variable, your config.php must include the code
-     * to configure the PHP session save handler as shown in config-dist.php
-     */
-    public $memcached;
-
     /**
      * Adding in support for using Redis for session caching.
      *

vendor/tsugi/lib/src/UI/Lessons.php

@@ -992,19 +992,11 @@ public function renderBadges($allgrades, $buffer=false)
                 echo('<tr><td>');
 
                 $rest_path = U::rest_path();
-<<<<<<< Updated upstream
                 $href= "Missing ". $resource_link_id;
                 if ($module != null )  $href = $rest_path->parent . '/lessons/' . urlencode($module->anchor);
 
                 $badge_title = "Missing ". $resource_link_id;
                 if ( $lti != null ) $badge_title = $lti->title;
-=======
-		$href= "Missing ". $resource_link_id;
-		if ($module != null )  $href = $rest_path->parent . '/lessons/' . urlencode($module->anchor);
-
-		$badge_title = "Missing ". $resource_link_id;
-		if ( $lti != null ) $badge_title = $lti->title;
->>>>>>> Stashed changes
 
                 echo('<a href="'.$href.'">');
                 echo('<i class="fa fa-square-o text-info" aria-hidden="true" style="label label-success; padding-right: 5px;"></i>');