Skip to content
This repository was archived by the owner on Aug 12, 2021. It is now read-only.

A couple crucial issues with the requests #7

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

A couple crucial issues with the requests #7

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
dfb015e
Should enable modules after attaching a config and log class to Kohana
zeelot Nov 17, 2010
d5e0bf1
Typecasting the request response to a string to avoid errors
zeelot Nov 17, 2010
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
6 changes: 4 additions & 2 deletions kohana-for-wordpress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,10 @@ function kohana_the_content_filter($content)
break;
}
}



// Make sure $content is a string at this point (could be a View object or anything that implements __toString())
$content = (string)$content;

// Look for any Kohana requests that are dropped directly into the content
$tag = "/\[request(.*?)\\]/";
$matches = array();
Expand Down
18 changes: 9 additions & 9 deletions kohana_bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@
}
Kohana::init(array('charset' => 'utf-8', 'base_url' => $kohana_base_url ));

/** **** Enable modules as defined in plugin settings
* Enable modules. Modules are referenced by a relative or absolute path.
*/
$k_mods = explode(',', get_option('kohana_modules') );
foreach( $k_mods as $km ){
$mods[trim($km)] = MODPATH.trim($km);
}
Kohana::modules($mods);

/**
* Attach the file write to logging. Multiple writers are supported.
*/
Expand All @@ -74,6 +65,15 @@
*/
Kohana::$config->attach(new Kohana_Config_File);

/** **** Enable modules as defined in plugin settings
* Enable modules. Modules are referenced by a relative or absolute path.
*/
$k_mods = explode(',', get_option('kohana_modules') );
foreach( $k_mods as $km ){
$mods[trim($km)] = MODPATH.trim($km);
}
Kohana::modules($mods);

/**
* Set the routes. Each route must have a minimum of a name, a URI and a set of
* defaults for the URI.
Expand Down