moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-06-18 12:31:37 +02:00
commit e04a0e32c7
8 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
portfolio/boxnet/lib.php
View file

@ -106,7 +106,7 @@ class portfolio_plugin_boxnet extends portfolio_plugin_push_base {
}
}
public function admin_config_form(&$mform) {
public static function admin_config_form(&$mform) {
global $CFG;
$mform->addElement('text', 'apikey', get_string('apikey', 'portfolio_boxnet'));

2
portfolio/flickr/lib.php
View file

@ -96,7 +96,7 @@ class portfolio_plugin_flickr extends portfolio_plugin_push_base {
return true;
}
public function admin_config_form(&$mform) {
public static function admin_config_form(&$mform) {
global $CFG;
$strrequired = get_string('required');

2
portfolio/googledocs/lib.php
View file

@ -100,7 +100,7 @@ class portfolio_plugin_googledocs extends portfolio_plugin_push_base {
return array('clientid', 'secret');
}
public function admin_config_form(&$mform) {
public static function admin_config_form(&$mform) {
$a = new stdClass;
$a->docsurl = get_docs_url('Google_OAuth2_Setup');
$a->callbackurl = google_oauth::callback_url()->out(false);

2
portfolio/mahara/lib.php
View file

@ -84,7 +84,7 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base {
return true;
}
public function admin_config_form(&$mform) {
public static function admin_config_form(&$mform) {
$strrequired = get_string('required');
$hosts = self::get_mnet_hosts(); // this is called by sanity check but it's ok because it's cached
foreach ($hosts as $host) {

2
portfolio/picasa/lib.php
View file

@ -100,7 +100,7 @@ class portfolio_plugin_picasa extends portfolio_plugin_push_base {
return array('clientid', 'secret');
}
public function admin_config_form(&$mform) {
public static function admin_config_form(&$mform) {
$a = new stdClass;
$a->docsurl = get_docs_url('Google_OAuth2_Setup');
$a->callbackurl = google_oauth::callback_url()->out(false);

9
portfolio/upgrade.txt Normal file
View file

@ -0,0 +1,9 @@
This files describes API changes in /portfolio/ portfolio system,
information provided here is intended especially for developers.
=== 2.3 ===
required changes:
* The following methods must now be declared static for php5 compatibility:
- admin_config_form
- admin_config_validation