Fix merge

main/inc/lib/api.lib.php

@@ -581,14 +581,9 @@ require_once __DIR__.'/internationalization.lib.php';
  * Also, this function provides conversion between path types, in this case the input path points inside the Chamilo area too.
  *
  * See $_configuration['course_folder'] in the configuration.php to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters.
-<<<<<<< HEAD
- * @param string $path              The requested path type (a defined constant), see the examples.
- * @param array $configuration
 
-=======
  * @param string $path (optional)   A path which type is to be converted. Also, it may be a defined constant for a path.
  * This parameter has meaning when $type parameter has one of the following values: TO_WEB, TO_SYS, TO_REL. Otherwise it is ignored.
->>>>>>> origin/1.10.x
  * @return string                   The requested path or the converted path.
  *
  *

main/inc/lib/banner.lib.php

@@ -153,13 +153,10 @@ function getCustomTabs()
 }
 
 /**
-<<<<<<< HEAD
  * Return the active logo of the portal, based on a series of settings
  * @param string $theme The name of the theme folder from web/css/themes/
  * @return string HTML string with logo as an HTML element
-=======
  * @param string $theme
->>>>>>> origin/1.10.x
  */
 function return_logo($theme)
 {
@@ -578,15 +575,11 @@ function menuArray()
 }
 
 /**
-<<<<<<< HEAD
  * Return the breadcrumb menu elements as an array of <li> items
  * @param array $interbreadcrumb The elements to add to the breadcrumb
  * @param string $language_file Deprecated
  * @param string $nameTools The name of the current tool (not linked)
  * @return string HTML string of <li> items
-=======
- * @param string $nameTools
->>>>>>> origin/1.10.x
  */
 function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
 {

main/inc/lib/course_category.lib.php

@@ -94,25 +94,8 @@ class CourseCategory
             $category['nbr_courses'] = 1;
         }
 
-<<<<<<< HEAD
         return $categories;
     }
-=======
-/**
- * @param string $code
- * @param string $name
- * @param string $canHaveCourses
- * @param int $parent_id
- *
- * @return false|string
- */
-function addNode($code, $name, $canHaveCourses, $parent_id)
-{
-    $tbl_category = Database::get_main_table(TABLE_MAIN_CATEGORY);
-    $code = trim($code);
-    $name = trim($name);
-    $parent_id = trim($parent_id);
->>>>>>> origin/1.10.x
 
     /**
      * @param string $code
@@ -308,27 +291,7 @@ function addNode($code, $name, $canHaveCourses, $parent_id)
             WHERE code= '".$row['code']."'";
         Database::query($sql);
 
-<<<<<<< HEAD
         return true;
-=======
-/**
- * Counts the number of children categories a category has
- * @param int   $categoryId The ID of the category of which we want to count the children
- * @return integer The number of subcategories this category has
- */
-function courseCategoryChildrenCount($categoryId)
-{
-    $tbl_category = Database::get_main_table(TABLE_MAIN_CATEGORY);
-    $categoryId = intval($categoryId);
-    $count = 0;
-    if (empty($categoryId)) {
-        return 0;
-    }
-    $sql = "SELECT id, code FROM $tbl_category WHERE parent_id = $categoryId";
-    $result = Database::query($sql);
-    while ($row = Database::fetch_array($result)) {
-        $count += courseCategoryChildrenCount($row['id']);
->>>>>>> origin/1.10.x
     }
 
     /**
@@ -510,7 +473,6 @@ function courseCategoryChildrenCount($categoryId)
         return Database::store_result(Database::query($sql));
     }
 
-<<<<<<< HEAD
     /**
      * @param int $id
      *
@@ -519,17 +481,6 @@ function courseCategoryChildrenCount($categoryId)
     public static function addToUrl($id)
     {
         UrlManager::addCourseCategoryListToUrl(array($id), array(api_get_current_access_url_id()));
-=======
-/**
- * @param int $id
- *
- * @return false|null
- */
-function addToUrl($id)
-{
-    if (!isMultipleUrlSupport()) {
-        return false;
->>>>>>> origin/1.10.x
     }
 
     /**
@@ -967,53 +918,6 @@ function addToUrl($id)
         return Database::store_result($result, 'ASSOC');
     }
 
-<<<<<<< HEAD
-    /**
-     * @return array
-     */
-    public static function getLimitArray()
-    {
-        $pageCurrent = isset($_REQUEST['pageCurrent']) ?
-            intval($_GET['pageCurrent']) :
-            1;
-        $pageLength = isset($_REQUEST['pageLength']) ?
-            intval($_GET['pageLength']) :
-            10;
-
-        return array(
-            'start' => ($pageCurrent - 1) * $pageLength,
-            'current' => $pageCurrent,
-            'length' => $pageLength,
-        );
-=======
-    return $limitFilter;
-}
-
-/**
- * Get Pagination HTML div
- * @param $pageCurrent
- * @param $pageLength
- * @param integer $pageTotal
- * @return string
- */
-function getCataloguePagination($pageCurrent, $pageLength, $pageTotal)
-{
-    // Start empty html
-    $pageDiv = '';
-    $html='';
-    $pageBottom = max(1, $pageCurrent - 3);
-    $pageTop = min($pageTotal, $pageCurrent + 3);
-
-    if ($pageBottom > 1) {
-        $pageDiv .= getPageNumberItem(1, $pageLength);
-        if ($pageBottom > 2) {
-            $pageDiv .= getPageNumberItem($pageBottom - 1, $pageLength, null, '...');
-        }
-    } else {
-        // Nothing to do
->>>>>>> origin/1.10.x
-    }
-
     /**
      * Return LIMIT to filter SQL query
      * @param array $limit

main/install/version.php

@@ -13,11 +13,7 @@
 /**
  * Variables used from the main/install/index.php
  */
-<<<<<<< HEAD
 $new_version = '1.11.0';
-=======
-$new_version = '1.10.6';
->>>>>>> origin/1.10.x
 $new_version_status = 'stable';
 $new_version_last_id = 0;
 $new_version_stable = true;