Răsfoiți Sursa

Fixing "Non static method should not be called statically" bug see #4219

Julio Montoya 13 ani în urmă
părinte
comite
1b5bf9ec0b

+ 1 - 1
main/inc/lib/course.lib.php

@@ -3505,7 +3505,7 @@ class CourseManager {
      * @param id    url id
      * 
      **/    
-    public function update_course_ranking($course_id = null, $session_id = null, $url_id = null, $points_to_add = null, $add_access = true, $add_user = true) {        
+    public static function update_course_ranking($course_id = null, $session_id = null, $url_id = null, $points_to_add = null, $add_access = true, $add_user = true) {        
         //Course catalog stats modifications see #4191        
         $table_course_ranking       = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);
                 

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

@@ -1194,7 +1194,7 @@ class Database {
      * @param   array
      * @todo lot of stuff to do here
     */
-    public function parse_conditions($conditions) {        
+    private static function parse_conditions($conditions) {        
         if (empty($conditions)) {
             return '';
         }
@@ -1286,7 +1286,7 @@ class Database {
         return $return_value;
     }
 
-    private function parse_where_conditions($coditions) {
+    public static function parse_where_conditions($coditions) {
         return self::parse_conditions(array('where'=>$coditions));
     }
 

+ 3 - 3
main/inc/lib/database.mysqli.lib.php

@@ -1076,7 +1076,7 @@ class Database {
      * @todo lot of stuff to do here
     */
 
-    public static function select($columns = '*' , $table_name,  $conditions = array(), $type_result = 'all', $option = 'ASSOC') {
+    public static function select($columns, $table_name,  $conditions = array(), $type_result = 'all', $option = 'ASSOC') {
         $conditions = self::parse_conditions($conditions);
 
         //@todo we could do a describe here to check the columns ...
@@ -1116,7 +1116,7 @@ class Database {
      * @param   array
      * @todo lot of stuff to do here
     */
-    private function parse_conditions($conditions) {
+    private static function parse_conditions($conditions) {
         if (empty($conditions)) {
             return '';
         }
@@ -1205,7 +1205,7 @@ class Database {
         return $return_value;
     }
 
-    private function parse_where_conditions($coditions){
+    public static function parse_where_conditions($coditions){
         return self::parse_conditions(array('where'=>$coditions));
     }
 

Fișier diff suprimat deoarece este prea mare
+ 603 - 603
main/inc/lib/pear/HTML/QuickForm/advmultiselect.php


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff