Merge pull request #402 from kaltura/MOODLE_400_DEV_446

Moodle 400 dev 446
kaltura · Jun 12, 2023 · 519300c · 519300c
2 parents 9bce9e5 + fecc841
commit 519300c
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 29 deletions.
diff --git a/blocks/kalturamediagallery/version.php b/blocks/kalturamediagallery/version.php
@@ -14,11 +14,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2022041906;
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->version   = 2022041907;
+$plugin->release = 'Kaltura release 4.4.6';
 $plugin->requires  = 2022041902;
 $plugin->component = 'block_kalturamediagallery';
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906,
-    'local_kalturamediagallery' => 2022041906
+    'local_kaltura' => 2022041907,
+    'local_kalturamediagallery' => 2022041907
 );
diff --git a/filter/kaltura/version.php b/filter/kaltura/version.php
@@ -24,11 +24,11 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022041906; //version date YYYYMMDDXX 10 represent 3.0 for future option to moodle use 2 digit version
+$plugin->version = 2022041907; //version date YYYYMMDDXX 10 represent 3.0 for future option to moodle use 2 digit version
 $plugin->component  = 'filter_kaltura';
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->release = 'Kaltura release 4.4.6';
 $plugin->requires = 2022041902;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906
+    'local_kaltura' => 2022041907
 );
diff --git a/lib/editor/atto/plugins/kalturamedia/version.php b/lib/editor/atto/plugins/kalturamedia/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2022041906;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->version   = 2022041907;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = 'Kaltura release 4.4.6';
 $plugin->requires  = 2022041902;        // Requires this Moodle version.
 $plugin->component = 'atto_kalturamedia';  // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906
+    'local_kaltura' => 2022041907
 );
diff --git a/lib/editor/tinymce/plugins/kalturamedia/version.php b/lib/editor/tinymce/plugins/kalturamedia/version.php
@@ -23,12 +23,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2022041906;
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->version   = 2022041907;
+$plugin->release = 'Kaltura release 4.4.6';
 // Required Moodle version.
 $plugin->requires  = 2022041902;
 // Full name of the plugin (used for diagnostics).
 $plugin->component = 'tinymce_kalturamedia';
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906
+    'local_kaltura' => 2022041907
 );
diff --git a/local/kaltura/version.php b/local/kaltura/version.php
@@ -25,9 +25,9 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2022041906;
+$plugin->version = 2022041907;
 $plugin->component = 'local_kaltura';
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->release = 'Kaltura release 4.4.6';
 $plugin->requires = 2022041902;
 $plugin->maturity = MATURITY_STABLE;
 

diff --git a/local/kalturamediagallery/index.php b/local/kalturamediagallery/index.php
@@ -41,7 +41,6 @@
 
 $PAGE->set_url('/local/kalturamediagallery/index.php', array('courseid' => $courseid));
 $PAGE->set_pagetype('kalturamediagallery-index');
-$PAGE->set_pagelayout('standard');
 $PAGE->set_title($header);
 $PAGE->set_heading($header);
 

diff --git a/local/kalturamediagallery/version.php b/local/kalturamediagallery/version.php
@@ -26,11 +26,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2022041906;
+$plugin->version = 2022041907;
 $plugin->component = 'local_kalturamediagallery';
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->release = 'Kaltura release 4.4.6';
 $plugin->requires = 2022041902;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906
+    'local_kaltura' => 2022041907
 );
diff --git a/local/mymedia/lib.php b/local/mymedia/lib.php
@@ -53,6 +53,7 @@ function local_mymedia_extend_navigation($navigation) {
         return;
     }
 
+    // side navigation
     if (get_config('local_mymedia', 'link_location') == LOCAL_KALTURAMYMEDIA_LINK_LOCATION_SIDE_NAVIGATION_MENU) {
         $nodehome = $navigation->get('home');
         if (empty($nodehome)){
@@ -65,7 +66,13 @@ function local_mymedia_extend_navigation($navigation) {
         return;
     }
 
+    // top navigation
     $menuHeaderStr = get_string('nav_mymedia', 'local_mymedia');
+    if (strpos($CFG->custommenuitems, $menuHeaderStr) !== false) {
+        //My Media is already part of the config, no need to add it again.
+        return;
+    }
+
     $myMediaStr = "\n$menuHeaderStr|/local/mymedia/mymedia.php";
     $CFG->custommenuitems .= $myMediaStr;
 }
diff --git a/local/mymedia/mymedia.php b/local/mymedia/mymedia.php
@@ -37,7 +37,6 @@
 
 $PAGE->set_url('/local/mymedia/mymedia.php');
 $PAGE->set_pagetype('mymedia-index');
-$PAGE->set_pagelayout('standard');
 $PAGE->set_title($header);
 $PAGE->set_heading($header);
 

diff --git a/local/mymedia/version.php b/local/mymedia/version.php
@@ -25,11 +25,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2022041906;
+$plugin->version = 2022041907;
 $plugin->component = 'local_mymedia';
-$plugin->release = 'Kaltura release 4.4.5';
+$plugin->release = 'Kaltura release 4.4.6';
 $plugin->requires = 2022041902;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906
+    'local_kaltura' => 2022041907
 );
diff --git a/mod/kalvidassign/version.php b/mod/kalvidassign/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2022041906;
+$plugin->version = 2022041907;
 $plugin->component  = 'mod_kalvidassign';
-$plugin->release    = 'Kaltura release 4.4.5';
+$plugin->release    = 'Kaltura release 4.4.6';
 $plugin->requires = 2022041902;
 $plugin->cron       = 0;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906,
+    'local_kaltura' => 2022041907,
 );
diff --git a/mod/kalvidres/version.php b/mod/kalvidres/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2022041906;
+$plugin->version = 2022041907;
 $plugin->component  = 'mod_kalvidres';
-$plugin->release    = 'Kaltura release 4.4.5';
+$plugin->release    = 'Kaltura release 4.4.6';
 $plugin->requires = 2022041902;
 $plugin->cron       = 0;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2022041906
+    'local_kaltura' => 2022041907
 );