Merge branch 'master' of github.com:atutor/ATutor

diff --git a/bundle.sh b/bundle.sh
index 6df3381..e71ab04 100755 (executable)
--- a/bundle.sh
+++ b/bundle.sh
@@ -1,4 +1,4 @@
-#! /bin/csh -f
+# /bin/csh -f
 #########################################################################
 # ATutor bundle script                                                  #
 # ./bundle [VERSION] to specify an optional version number              #
@@ -11,6 +11,8 @@
 # This script retreives a copy of the latest English language from the atutor.ca language database via wget.
 #
 
+
+
 set now = `date +"%Y_%m_%d"`
 set atutor_dir = "ATutor_$now"
 set bundle = "ATutor"
@@ -149,4 +151,4 @@ echo " >> Did you update check_atutor_version.php ?? <<"
 echo "Bundle complete. Enjoy.Exiting."
 
 
-exit 1
\ No newline at end of file
+exit 1

diff --git a/docs/mods/_core/imscp/ims_import.php b/docs/mods/_core/imscp/ims_import.php
index a162fe5..103163e 100644 (file)
--- a/docs/mods/_core/imscp/ims_import.php
+++ b/docs/mods/_core/imscp/ims_import.php
@@ -1222,7 +1222,11 @@ foreach ($items as $item_id => $content_info)
                $all_package_base_path = implode('/', $all_package_base_path);
        }
 
-       if ($common_path != '' && substr($content_info['new_path'], strlen($common_path))) {
+    // The following condition checks if there is a common path, if so, remove it from the content base_href.
+    // This prevents the path to grow longer.
+       if ($common_path != '' 
+               && ($content_info['new_path'] === $common_path
+               || substr($content_info['new_path'], strlen($common_path)))) {
                $content_info['new_path'] = $package_base_name . substr($content_info['new_path'], strlen($common_path));
        } else {
                $content_info['new_path'] = $package_base_name . '/' . $content_info['new_path'];

diff --git a/readme b/readme
index 5360a52..36f91d3 100644 (file)
--- a/readme
+++ b/readme
@@ -1,6 +1,6 @@
 ATutor Readme
 
-Installing a ATutor bundled distribution 
+Installing an ATutor bundled distribution 
 Full installation and upgrade instructions are available at:
 http://atutor.ca/atutor/docs/installation.php
 
@@ -15,4 +15,3 @@ If you wish to have code you've developed added to the ATutor public source code
 
 See: http://wiki.atutor.ca/display/atutorwiki/Using+Git+and+GitHub
 
-