Преглед изворни кода

Merge remote-tracking branch 'chamilo.1.9.x/1.9.x' into 5751

Yoselyn Castillo пре 11 година
родитељ
комит
8137ed5b12

+ 31 - 0
documentation/changelog.html

@@ -44,6 +44,37 @@
 <p><i>Note: most #wxyz references are issue numbers you can find in <a href="http://support.chamilo.org/projects/chamilo-18/issues" target="_blank">our public bug tracking system</a>. Some references marked BT#xyz are developments made externally for BeezNest customers and integrated into Chamilo. The details of these tasks cannot be seen for confidentiality reasons, but the code change is public and can be reviewed by anyone.</i></p>
 <p>&nbsp;</p>
 
+<h1>Chamilo 1.9.8 - Mystery name, Mystery date, 2013</h1>
+<h3>Release notes - summary</h3>
+<p>Chamilo 1.9.8 is a minor stable version with a series of improvements on top of 1.9.6.</p>
+<h3>Release name</h3>
+<p><a href="http://fr.wikipedia.org/wiki/">City name</a> is a city ... </p>
+<h3>Security</h3>
+<ul>
+  <li></li>
+</ul>
+<h3>New Features</h3>
+<ul>
+  <li></li>
+</ul>
+<h3>Improvements</h3>
+<ul>
+  <li></li>
+</ul>
+<h3>Debugging</h3>
+<ul>
+  <li></li>
+</ul>
+<h3>Stylesheets and theming</h3>
+<ul>
+  <li></li>
+</ul>
+<h3>Web services</h3>
+<ul>
+  <li></li>
+</ul>
+
+
 <h1>Chamilo 1.9.6 - Rochefort, 4th of June, 2013</h1>
 <h3>Release notes - summary</h3>
 <p>Chamilo 1.9.6 is a minor stable version with security patches and a series of improvements on top of 1.9.4.</p>

+ 6 - 6
documentation/installation_guide_es_ES.html

@@ -291,7 +291,7 @@ Dado que se trata sólo de un cambio de versión menor  previa de Chamilo 1.9.*,
 <li>Revisar que no ha dejado alguna hoja de estilo personalizada o imagen (si es que tiene, asegúrese de guardar una copia de respaldo)</li>
 <li>Descargar el paquete de instalación de Chamilo 1.9 desde la página de descarga de Chamilo</li>
 <li>Descomprimir los nuevos archivos de Chamilo 1.9 sobre los archivos de la versión anterior (o descomprimirlos en una nueva carpeta y después copiarlos sobre los archivos de la versión anterior)</li>
-<li>Editar el archivo main/inc/conf/configuration.php: hacia el final del archivo, localizar el número de la versión (p.e. ‘1.9.4’) y cambiarlo por la nueva versión (p.e.‘1.9.6’)</li>
+<li>Editar el archivo main/inc/conf/configuration.php: hacia el final del archivo, localizar el número de la versión (p.e. ‘1.9.4’) y cambiarlo por la nueva versión (p.e.‘1.9.8’)</li>
 <li>Ya está! Ningún otro procedimiento de actualización es requerido.</li>
 </ul>
 </p>
@@ -429,11 +429,11 @@ Escribir en la línea de comandos:
   <li>mkdir /var/www/chamilo/version_antigua</li>
   <li>mv /var/www/chamilo/* /var/www/chamilo/version_antigua/</li>
   <li>chmod -R 0777 /var/www/chamilo/version_antigua/</li>
-  <li>wget http://www.chamilo.org/files/chamilo-1.9.6.tar.gz</li>
-  <li>tar zxvf chamilo-1.9.6.tar.gz</li>
-  <li>sudo cp -ra chamilo-1.9.6/* /var/www/chamilo/</li>
-  <li>rm chamilo-1.9.6.tar.gz</li>
-  <li>sudo rm -r chamilo-1.9.6/</li>
+  <li>wget http://www.chamilo.org/files/chamilo-1.9.8.tar.gz</li>
+  <li>tar zxvf chamilo-1.9.8.tar.gz</li>
+  <li>sudo cp -ra chamilo-1.9.8/* /var/www/chamilo/</li>
+  <li>rm chamilo-1.9.8.tar.gz</li>
+  <li>sudo rm -r chamilo-1.9.8/</li>
 </ul>
 
 <br />


+ 3 - 3
main/admin/index.php

@@ -251,7 +251,7 @@ if (api_is_platform_admin()) {
 
     //Skills
     if (api_get_setting('allow_skills_tool') == 'true') {
-        $blocks['skills']['icon']  = Display::return_icon('logo.gif', get_lang('Skills'), array(), ICON_SIZE_SMALL, false);
+        $blocks['skills']['icon']  = Display::return_icon('logo.png', get_lang('Skills'), array(), ICON_SIZE_SMALL, false);
         $blocks['skills']['label'] = get_lang('Skills');
 
         $items = array();
@@ -268,7 +268,7 @@ if (api_is_platform_admin()) {
 
 	/* Chamilo.org */
 
-	$blocks['chamilo']['icon']  = Display::return_icon('logo.gif', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
+	$blocks['chamilo']['icon']  = Display::return_icon('logo.png', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
 	$blocks['chamilo']['label'] = 'Chamilo.org';
 
 	$items = array();
@@ -293,7 +293,7 @@ if (api_is_platform_admin()) {
 	//ob_flush();
 
     //Version check
-    $blocks['version_check']['icon']  = Display::return_icon('logo.gif', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
+    $blocks['version_check']['icon']  = Display::return_icon('logo.png', 'Chamilo.org', array(), ICON_SIZE_SMALL, false);
 	$blocks['version_check']['label'] = get_lang('VersionCheck');
 	$blocks['version_check']['extra'] = version_check();
     $blocks['version_check']['search_form'] = null;

BIN
main/img/icons/32/platform.png


BIN
main/img/icons/48/platform.png


BIN
main/img/logo.gif


BIN
main/img/logo.png


+ 4 - 1
main/install/index.php

@@ -111,7 +111,7 @@ error_reporting(E_ALL);
 // Upgrading from any subversion of 1.6 is just like upgrading from 1.6.5
 $update_from_version_6 = array('1.6', '1.6.1', '1.6.2', '1.6.3', '1.6.4', '1.6.5');
 // Upgrading from any subversion of 1.8 avoids the additional step of upgrading from 1.6
-$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0', '1.9.2');
+$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0', '1.9.2','1.9.4','1.9.6');
 
 $my_old_version = '';
 $tmp_version = get_config_param('dokeos_version');
@@ -851,6 +851,9 @@ if (@$_POST['step2']) {
 
                 break;
             case '1.9.0':
+            case '1.9.2':
+            case '1.9.4':
+            case '1.9.6':
             default:
                 break;
         }

Разлика између датотеке није приказан због своје велике величине
+ 251 - 245
main/work/work.lib.php


+ 2 - 2
main/work/work.php

@@ -409,7 +409,7 @@ switch ($action) {
             }
         }
 
-        $form = new FormValidator('form', 'POST', api_get_self() . "?action=upload&id=".$work_id."&gradebook=".Security::remove_XSS($_GET['gradebook'])."&origin=$origin", '', array('enctype' => "multipart/form-data"));
+        $form = new FormValidator('form', 'POST', api_get_self()."?".api_get_cidreq()."&action=upload&id=".$work_id."&gradebook=".Security::remove_XSS($_GET['gradebook'])."&origin=$origin", '', array('enctype' => "multipart/form-data"));
 
         // form title
         if ($item_id) {
@@ -717,7 +717,7 @@ switch ($action) {
                     $emailbody .= get_lang('WorkName')." : ".$title."\n\n".get_lang('DownloadLink')."\n";
                     $url = api_get_path(WEB_CODE_PATH)."work/work.php?".api_get_cidreq()."&amp;id=".$work_id;
                     $emailbody .= $url;
-                    
+
                     MessageManager::send_message_simple($to_user_id, $emailsubject, $emailbody);
                 }
             }

Неке датотеке нису приказане због велике количине промена