Browse Source

Merge pull request #863 from jloguercio/variousFixes

Various warning and notice fixes
Yannick Warnier 9 years ago
parent
commit
b5cad7ee3a

+ 0 - 37
main/inc/lib/pear/HTML/QuickForm/textarea.php

@@ -225,21 +225,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         return $html . $this->_getPersistantData();
     }
     
-    /**
-     * @return null
-     */
-    public function getInputSize()
-    {
-        return $this->inputSize;
-    }
-
-    /**
-     * @param null $inputSize
-     */
-    public function setInputSize($inputSize)
-    {
-        $this->inputSize = $inputSize;
-    }
     /**
      * @return null
      */
@@ -266,28 +251,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $size = $this->getColumnsSize();
         $this->removeAttribute('cols-size');
 
-        if (empty($size)) {
-            $sizeTemp = $this->getInputSize();
-            if (empty($size)) {
-                $sizeTemp = 8;
-            }
-            $size = array(2, $sizeTemp, 2);
-        } else {
-            if (is_array($size)) {
-                if (count($size) != 3) {
-                    $sizeTemp = $this->getInputSize();
-                    if (empty($size)) {
-                        $sizeTemp = 8;
-                    }
-                    $size = array(2, $sizeTemp, 2);
-                }
-                // else just keep the $size array as received
-            } else {
-                $size = array(2, intval($size), 2);
-            }
-        }
-        
-
         switch ($layout) {
             case FormValidator::LAYOUT_INLINE:
                 return '

+ 2 - 2
main/inc/lib/social.lib.php

@@ -726,7 +726,7 @@ class SocialManager extends UserManager
         )) {
 
             
-            $links .= '<ul class="nav nav-pills nav-stacked">';
+            $links = '<ul class="nav nav-pills nav-stacked">';
             
             $active = $show == 'home' ? 'active' : null;
             $links .= '
@@ -814,7 +814,7 @@ class SocialManager extends UserManager
 
         if ($show == 'shared_profile') {
             
-            $links .=  '<ul class="nav nav-pills nav-stacked">';
+            $links =  '<ul class="nav nav-pills nav-stacked">';
 
             // My own profile
             if ($show_full_profile && $user_id == intval(api_get_user_id())) {

+ 2 - 2
main/inc/lib/tracking.lib.php

@@ -1102,6 +1102,7 @@ class Tracking
      */
     public static function getStats($userId)
     {
+        $courses = array();
         $assignedCourses = array();
         if (api_is_drh() && api_drh_can_access_all_session_content()) {
             $studentList = SessionManager::getAllUsersFromCoursesFromAllSessionFromStatus(
@@ -1172,8 +1173,7 @@ class Tracking
                 null,
                 null,
                 null
-            );
-            $courses = array();
+            );  
             foreach ($platformCourses as $course) {
                 $courses[$course['code']] = $course['code'];
             }