chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing in Quickform because advmultiselect was not added in the registered element types

Browse Source
skala
Julio Montoya 13 years ago
parent 0b8ce8948a
commit 780f18549d
3 changed files with 34 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 64
      main/inc/lib/pear/HTML/QuickForm.php
  2. 2
      tests/xhprof/xhprof_lib/display/xhprof.php
  3. 1
      tests/xhprof/xhprof_lib/utils/xhprof_lib.php

64
main/inc/lib/pear/HTML/QuickForm.php
Unescape View File

@ -38,36 +38,35 @@ require_once 'HTML/Common.php';
* HTML_QuickForm::isTypeRegistered() * HTML_QuickForm::isTypeRegistered()
* @global array $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'] * @global array $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES']
*/ */
$GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'] = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'] =array(
array( 'group' => array('HTML/QuickForm/group.php','HTML_QuickForm_group'),
'group' =>array('HTML/QuickForm/group.php','HTML_QuickForm_group'), 'hidden' => array('HTML/QuickForm/hidden.php','HTML_QuickForm_hidden'),
'hidden' =>array('HTML/QuickForm/hidden.php','HTML_QuickForm_hidden'), 'reset' => array('HTML/QuickForm/reset.php','HTML_QuickForm_reset'),
'reset' =>array('HTML/QuickForm/reset.php','HTML_QuickForm_reset'), 'checkbox' => array('HTML/QuickForm/checkbox.php','HTML_QuickForm_checkbox'),
'checkbox' =>array('HTML/QuickForm/checkbox.php','HTML_QuickForm_checkbox'), 'file' => array('HTML/QuickForm/file.php','HTML_QuickForm_file'),
'file' =>array('HTML/QuickForm/file.php','HTML_QuickForm_file'), 'image' => array('HTML/QuickForm/image.php','HTML_QuickForm_image'),
'image' =>array('HTML/QuickForm/image.php','HTML_QuickForm_image'), 'password' => array('HTML/QuickForm/password.php','HTML_QuickForm_password'),
'password' =>array('HTML/QuickForm/password.php','HTML_QuickForm_password'), 'radio' => array('HTML/QuickForm/radio.php','HTML_QuickForm_radio'),
'radio' =>array('HTML/QuickForm/radio.php','HTML_QuickForm_radio'), 'button' => array('HTML/QuickForm/button.php','HTML_QuickForm_button'),
'button' =>array('HTML/QuickForm/button.php','HTML_QuickForm_button'), 'submit' => array('HTML/QuickForm/submit.php','HTML_QuickForm_submit'),
'submit' =>array('HTML/QuickForm/submit.php','HTML_QuickForm_submit'), 'select' => array('HTML/QuickForm/select.php','HTML_QuickForm_select'),
'select' =>array('HTML/QuickForm/select.php','HTML_QuickForm_select'), 'hiddenselect' => array('HTML/QuickForm/hiddenselect.php','HTML_QuickForm_hiddenselect'),
'hiddenselect' =>array('HTML/QuickForm/hiddenselect.php','HTML_QuickForm_hiddenselect'), 'text' => array('HTML/QuickForm/text.php','HTML_QuickForm_text'),
'text' =>array('HTML/QuickForm/text.php','HTML_QuickForm_text'), 'textarea' => array('HTML/QuickForm/textarea.php','HTML_QuickForm_textarea'),
'textarea' =>array('HTML/QuickForm/textarea.php','HTML_QuickForm_textarea'), 'link' => array('HTML/QuickForm/link.php','HTML_QuickForm_link'),
'link' =>array('HTML/QuickForm/link.php','HTML_QuickForm_link'), 'advcheckbox' => array('HTML/QuickForm/advcheckbox.php','HTML_QuickForm_advcheckbox'),
'advcheckbox' =>array('HTML/QuickForm/advcheckbox.php','HTML_QuickForm_advcheckbox'), 'date' => array('HTML/QuickForm/date.php','HTML_QuickForm_date'),
'date' =>array('HTML/QuickForm/date.php','HTML_QuickForm_date'), 'static' => array('HTML/QuickForm/static.php','HTML_QuickForm_static'),
'static' =>array('HTML/QuickForm/static.php','HTML_QuickForm_static'), 'header' => array('HTML/QuickForm/header.php', 'HTML_QuickForm_header'),
'header' =>array('HTML/QuickForm/header.php', 'HTML_QuickForm_header'), 'html' => array('HTML/QuickForm/html.php', 'HTML_QuickForm_html'),
'html' =>array('HTML/QuickForm/html.php', 'HTML_QuickForm_html'), 'hierselect' => array('HTML/QuickForm/hierselect.php', 'HTML_QuickForm_hierselect'),
'hierselect' =>array('HTML/QuickForm/hierselect.php', 'HTML_QuickForm_hierselect'), 'autocomplete' => array('HTML/QuickForm/autocomplete.php', 'HTML_QuickForm_autocomplete'),
'autocomplete' =>array('HTML/QuickForm/autocomplete.php', 'HTML_QuickForm_autocomplete'), 'xbutton' => array('HTML/QuickForm/xbutton.php','HTML_QuickForm_xbutton'),
'xbutton' =>array('HTML/QuickForm/xbutton.php','HTML_QuickForm_xbutton'), 'advanced_settings' => array('HTML/QuickForm/advanced_settings.php','HTML_QuickForm_advanced_settings'),
'advanced_settings' =>array('HTML/QuickForm/advanced_settings.php','HTML_QuickForm_advanced_settings'), 'label' => array('HTML/QuickForm/label.php','HTML_QuickForm_label'),
'label' =>array('HTML/QuickForm/label.php','HTML_QuickForm_label'), 'email' => array('HTML/QuickForm/email.php','HTML_QuickForm_email'),
'email' =>array('HTML/QuickForm/email.php','HTML_QuickForm_email'), 'advmultiselect' => array('HTML/QuickForm/advmultiselect.php','HTML_QuickForm_advmultiselect')
);
);
/** /**
* Validation rules known to HTML_QuickForm * Validation rules known to HTML_QuickForm
@ -624,11 +623,14 @@ class HTML_QuickForm extends HTML_Common
$error = PEAR::raiseError(null, QUICKFORM_UNREGISTERED_ELEMENT, null, E_USER_WARNING, "Element '$type' does not exist in HTML_QuickForm::_loadElement()", 'HTML_QuickForm_Error', true); $error = PEAR::raiseError(null, QUICKFORM_UNREGISTERED_ELEMENT, null, E_USER_WARNING, "Element '$type' does not exist in HTML_QuickForm::_loadElement()", 'HTML_QuickForm_Error', true);
return $error; return $error;
} }
$className = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][1]; $className = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][1];
$includeFile = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][0]; $includeFile = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][0];
include_once($includeFile);
include_once $includeFile;
// Modified by Ivan Tcholakov, 16-MAR-2010. Suppressing a deprecation warning on PHP 5.3 // Modified by Ivan Tcholakov, 16-MAR-2010. Suppressing a deprecation warning on PHP 5.3
//$elementObject =& new $className(); //$elementObject =& new $className();
$elementObject = new $className(); $elementObject = new $className();
for ($i = 0; $i < 5; $i++) { for ($i = 0; $i < 5; $i++) {

2
tests/xhprof/xhprof_lib/display/xhprof.php
Unescape View File

@ -33,7 +33,7 @@ if (!isset($GLOBALS['XHPROF_LIB_ROOT'])) {
$GLOBALS['XHPROF_LIB_ROOT'] = realpath(dirname(__FILE__) . '/..'); $GLOBALS['XHPROF_LIB_ROOT'] = realpath(dirname(__FILE__) . '/..');
} }
include_once $GLOBALS['XHPROF_LIB_ROOT'].'/utils/xhprof_lib.php'; require_once $GLOBALS['XHPROF_LIB_ROOT'].'/utils/xhprof_lib.php';
include_once $GLOBALS['XHPROF_LIB_ROOT'].'/utils/callgraph_utils.php'; include_once $GLOBALS['XHPROF_LIB_ROOT'].'/utils/callgraph_utils.php';
include_once $GLOBALS['XHPROF_LIB_ROOT'].'/utils/xhprof_runs.php'; include_once $GLOBALS['XHPROF_LIB_ROOT'].'/utils/xhprof_runs.php';

1
tests/xhprof/xhprof_lib/utils/xhprof_lib.php
Unescape View File

@ -18,7 +18,6 @@
// This file contains various XHProf library (utility) functions. // This file contains various XHProf library (utility) functions.
// Do not add any display specific code here. // Do not add any display specific code here.
// //
function xhprof_error($message) { function xhprof_error($message) {
error_log($message); error_log($message);
} }

Write Preview
Loading…
Cancel
Save