Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Contrib 6498 master #22

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Contrib 6498 master #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9becad4
master update git ignore
AviMoto Aug 10, 2016
39f9473
CONTRIB-6498-master mod_tab: Replace all use of object
AviMoto Aug 10, 2016
a97ff2c
CONTRIB-6498-master mod_tab: replace use of deprecated function
AviMoto Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
/nbproject/
/nbproject/
/.settings/
/.buildpath
/.project
8 changes: 4 additions & 4 deletions lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function tab_add_instance($tab)
$value = trim($value);
if (isset($value) && $value <> '')
{
$option = new object();
$option = new stdClass();
$option->tabname = $value;
$option->tabid = $tab->id;

Expand Down Expand Up @@ -153,7 +153,7 @@ function tab_add_instance($tab)
$draftitemid = $tab->content[$key]['itemid'];
if ($draftitemid)
{
$tabcontentupdate = new object();
$tabcontentupdate = new stdClass();
$tabcontentupdate->id = $newtab_content_id;
$tabcontentupdate->tabcontent = file_save_draft_area_files($draftitemid, $context->id, 'mod_tab', 'content', $newtab_content_id, $editoroptions, $tab->content[$key]['text']);
$DB->update_record('tab_content', $tabcontentupdate);
Expand Down Expand Up @@ -204,7 +204,7 @@ function tab_update_instance($tab)


$value = trim($value);
$option = new object();
$option = new stdClass();
$option->tabname = $value;
$option->tabcontentorder = $tab->tabcontentorder[$key];
$option->externalurl = $tab->externalurl[$key];
Expand Down Expand Up @@ -245,7 +245,7 @@ function tab_update_instance($tab)
$draftitemid = $tab->content[$key]['itemid'];
if ($draftitemid)
{
$tabcontentupdate = new object();
$tabcontentupdate = new stdClass();
$tabcontentupdate->id = $newtab_content_id;
$tabcontentupdate->tabcontent = file_save_draft_area_files($draftitemid, $context->id, 'mod_tab', 'content', $newtab_content_id, $editoroptions, $tab->content[$key]['text']);
$DB->update_record('tab_content', $tabcontentupdate);
Expand Down
2 changes: 1 addition & 1 deletion locallib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function tab_embed_general($fullurl, $title, $clicktoopen, $mimetype)
// IE can not embed stuff properly if stored on different server
// that is why we use iframe instead, unfortunately this tag does not validate
// in xhtml strict mode
if ($mimetype === 'text/html' and check_browser_version('MSIE', 5))
if ($mimetype === 'text/html' and core_useragent::check_browser_version('MSIE', 5))
{
if (preg_match('(^https?://[^/]*)', $fullurl, $matches))
{
Expand Down