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

Version 3.3 #27

Merged
merged 2 commits into from
Oct 12, 2024
Merged

Version 3.3 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
837e4ba
Moved own classes to "classes/local" to comply to moodle standards as…
Oct 12, 2024
c979396
Removed unused transaction in external function and added global $USE…
Oct 12, 2024
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
2 changes: 1 addition & 1 deletion block_booksearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

use block_booksearch\data\data;
use block_booksearch\local\data;

defined('MOODLE_INTERNAL') || die();

Expand Down
9 changes: 3 additions & 6 deletions classes/external/search_book_content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
use external_single_structure;
use external_value;

use block_booksearch\data\data;
use block_booksearch\search\search;
use block_booksearch\local\data;
use block_booksearch\local\search;
use context_course;
use invalid_parameter_exception;
use stdClass;
Expand Down Expand Up @@ -94,7 +94,7 @@ public static function execute_returns() {
* array of objects each describing one search term occurance with text snippet and location data.
*/
public static function execute($courseid, $searchstring, $contextlength) {
global $CFG, $DB;
global $USER;
require_once(__DIR__ . '/../../locallib.php');

// Validate parameter.
Expand All @@ -107,9 +107,6 @@ public static function execute($courseid, $searchstring, $contextlength) {
]
);

// If an exception is thrown in the below code, all DB queries in this code will be rollback.
$transaction = $DB->start_delegated_transaction();

$courseid = $params['courseid'];
$searchstring = $params['searchstring'];
$contextlength = $params['contextlength'];
Expand Down
2 changes: 1 addition & 1 deletion classes/data/data.php → classes/local/data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace block_booksearch\data;
namespace block_booksearch\local;

use context_module;
use moodle_url;
Expand Down
2 changes: 1 addition & 1 deletion classes/search/search.php → classes/local/search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

namespace block_booksearch\search;
namespace block_booksearch\local;

use stdClass;

Expand Down
4 changes: 2 additions & 2 deletions version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
*/
defined('MOODLE_INTERNAL') || die();

$plugin->version = 2024081900; // The current plugin version (Date: YYYYMMDDHH).
$plugin->version = 2024101206; // The current plugin version (Date: YYYYMMDDHH).
$plugin->requires = 2020061510; // Requires this Moodle version.
$plugin->component = 'block_booksearch'; // Full name of the plugin (used for diagnostics).
$plugin->release = '3.2.0';
$plugin->release = '3.3';
$plugin->maturity = MATURITY_STABLE;