'.lang('error_page_layout_variable_conflict', implode(', ', $reserved_cols)).'
'.lang('error_inline_page_edit').'
';
- }
- else
- {
- $preview_str .= $asset;
- }
- $preview_str .= '';
- }
- }
- }
- }
- $preview = '';
- if (!empty($preview_str))
- {
- $img_container_styles = $params['img_container_styles'];
- if ($multiple == FALSE AND !empty($params['img_styles']))
- {
- $img_container_styles = $params['img_styles'];
- }
+ // NO LONGER NEEDED BECAUSE IT'S DONE DYNAMICALLY WITH JAVASCRIPT
+
+ // if (!empty($params['value']))
+ // {
+ // if (is_string($params['value']))
+ // {
+ // // unserialize if it is a serialized string
+ // if (is_json_str($params['value']))
+ // // if (is_serialized_str($params['value']))
+ // {
+ // $assets = json_decode($params['value'], TRUE);
+ // //$assets = unserialize($params['value']);
+ // }
+ // else if ($multiple)
+ // {
+ // // create assoc array with key being the image and the value being either the image name again or the caption
+ // $assets = preg_split('#\s*,\s*|\n#', $params['value']);
+
+ // }
+ // else
+ // {
+ // $assets = array($params['value']);
+ // }
+
+ // $preview_str = '';
+
+ // // loop through all the assets and concatenate them
+ // foreach($assets as $asset)
+ // {
+ // if (!empty($asset))
+ // {
+ // $asset_path = '';
+
+ // foreach($editable_filetypes as $folder => $regex)
+ // {
+ // if (!is_http_path($asset))
+ // {
+ // if (preg_match('#'.$regex.'#i', $asset))
+ // {
+ // $path = trim($params['folder'], '/').'/'.$asset;
+ // $asset_path = assets_path($path);
+ // break;
+ // }
+ // }
+ // else
+ // {
+ // $asset_path = $asset;
+ // }
+ // }
+
+ // // NO LONGER NEEDED BECAUSE IT IS DONE DYNAMICALLY
+ // if (!empty($asset_path))
+ // {
+ // $preview_str .= '';
+ // if (isset($params['is_image']) OR (!isset($params['is_image']) AND is_image_file($asset)))
+ // {
+ // $preview_str .= '';
+ // }
+ // else
+ // {
+ // $preview_str .= $asset;
+ // }
+ // $preview_str .= '';
+ // }
+ // }
+ // }
+ // }
+ // $preview = '';
+ // // if (!empty($preview_str))
+ // // {
+ // $img_container_styles = $params['img_container_styles'];
+ // if ($multiple == FALSE AND !empty($params['img_styles']))
+ // {
+ // $img_container_styles = $params['img_styles'];
+ // }
- $preview = '
';
-
- $preview .= $preview_str;
- $preview .= '
';
- }
- $params['after_html'] = $preview;
- }
+ // $preview = '
';
+ // // $preview .= $preview_str;
+ // $preview .= '
';
+ // // }
+ // $params['after_html'] = $preview;
+ // }
+ //
$params['type'] = '';
if ($multiple)
@@ -539,7 +544,8 @@ public function asset($params)
$data_params['resize_method'] = (isset($params['resize_method'])) ? $params['resize_method'] : 'maintain_ratio';
$data_params['hide_options'] = (isset($params['hide_options'])) ? (bool)$params['hide_options'] : FALSE;
$data_params['accept'] = (isset($params['accept'])) ? $params['accept'] : '';
-
+ $data_params['multiple'] = (isset($params['multiple'])) ? (bool)$params['multiple'] : '';
+
if (isset($params['hide_image_options']))
{
$data_params['hide_image_options'] = (isset($params['hide_image_options'])) ? (bool)$params['hide_image_options'] : FALSE;
@@ -564,7 +570,17 @@ public function asset($params)
{
$str = $form_builder->create_text($params);
}
- $str .= $params['after_html'];
+ $preview = '';
+ $img_container_styles = $params['img_container_styles'];
+ if ($multiple == FALSE AND !empty($params['img_styles']))
+ {
+ $img_container_styles = $params['img_styles'];
+ }
+
+ $preview = '
';
+ $preview .= '
';
+
+ $str .= $preview;
return $str;
}
@@ -1732,7 +1748,7 @@ public function keyval($params)
$params['value'] = '';
}
- $params['class'] = 'no_editor';
+ $params['class'] = (!empty($params['class'])) ? $params['class'].' no_editor': 'no_editor';
return $form_builder->create_textarea($params);
}
diff --git a/fuel/modules/fuel/libraries/Fuel_language.php b/fuel/modules/fuel/libraries/Fuel_language.php
index 21eb5fb69..eae448dc9 100644
--- a/fuel/modules/fuel/libraries/Fuel_language.php
+++ b/fuel/modules/fuel/libraries/Fuel_language.php
@@ -262,7 +262,7 @@ public function is_default($lang)
return TRUE;
}
// the default is the first option of the list
- $default = key($this->options);
+ $default = $this->default_option();
return $lang == $default;
}
@@ -606,7 +606,7 @@ function lang_segment($uri = NULL, $routed = 'both')
* Cleans a URI string value of any language segements
*
* @access public
- * @param string The URI string to check. If none provided, will use the regment_array or rsegment_array on the URI object (optional)
+ * @param string The URI string to check. If none provided, will use the rsegment_array or rsegment_array on the URI object (optional)
* @param boolean Determines whether to use a routed (TRUE), non-routed (FALSE) when looking at the URI segment if one is not provided in first argument (optional)
* @return string
*/
@@ -622,7 +622,7 @@ function cleaned_uri($uri = NULL, $routed = FALSE)
* Cleans a URI segments of any language segements
*
* @access public
- * @param string The URI string to check. If none provided, will use the regment_array or rsegment_array on the URI object (optional)
+ * @param string The URI string to check. If none provided, will use the rsegment_array or rsegment_array on the URI object (optional)
* @param boolean Determines whether to use a routed (TRUE), non-routed (FALSE) when looking at the URI segment if one is not provided in first argument (optional)
* @return string
*/
@@ -728,7 +728,7 @@ function uri($uri = '', $lang = NULL)
$uri = $this->cleaned_uri($uri);
// if $lang is set then we will check to see if it is a legit language and use it
- if (!empty($lang) AND $lang != $this->is_default($lang) AND !in_array($lang_seg, $no_lang))
+ if (!empty($lang) AND ($lang != $this->is_default($lang) OR $this->fuel->config('language_force_default_to_site_url')) AND !in_array($lang_seg, $no_lang))
{
if (!$this->is_mode('query_string'))
{
diff --git a/fuel/modules/fuel/libraries/Fuel_layouts.php b/fuel/modules/fuel/libraries/Fuel_layouts.php
index 46b748656..a789bc4a8 100644
--- a/fuel/modules/fuel/libraries/Fuel_layouts.php
+++ b/fuel/modules/fuel/libraries/Fuel_layouts.php
@@ -287,16 +287,19 @@ public function options_list($blocks = FALSE, $group = '')
}
// add all layouts without a group first
- foreach($layouts as $k => $layout)
+ if (empty($group))
{
- if (empty($layout->group) AND !$layout->is_hidden())
+ foreach($layouts as $k => $layout)
{
- $options[$layout->name] = $layout->label;
- // reduce array down
- unset($layouts[$k]);
+ if (empty($layout->group) AND !$layout->is_hidden())
+ {
+ $options[$layout->name] = $layout->label;
+ // reduce array down
+ unset($layouts[$k]);
+ }
}
}
-
+
//ksort($options);
if (!empty($group))
diff --git a/fuel/modules/fuel/libraries/Fuel_modules.php b/fuel/modules/fuel/libraries/Fuel_modules.php
index 505e58f32..8bd0d9d39 100644
--- a/fuel/modules/fuel/libraries/Fuel_modules.php
+++ b/fuel/modules/fuel/libraries/Fuel_modules.php
@@ -474,7 +474,7 @@ public function install($module)
{
$module = $this->get($module);
}
- $key = Fuel_install::INSTALLED_SETTINGS_KEY;
+ $key = Fuel_installer::INSTALLED_SETTINGS_KEY;
$installed = $this->fuel->settings->get($module->name(), $key);
if (empty($installed))
@@ -503,7 +503,7 @@ public function uninstall($module)
$module = $this->get($module);
}
- $key = Fuel_install::INSTALLED_SETTINGS_KEY;
+ $key = Fuel_installer::INSTALLED_SETTINGS_KEY;
$installed = $this->fuel->settings->get($module->name(), $key);
if (empty($installed))
{
@@ -762,7 +762,7 @@ public function info($prop = NULL)
break;
}
}
- if (empty($this->_info['display_field'])) $this->_info['display_field'] = $this->_info[1]; // usually the second field is the display_field... first is the id
+ if (empty($this->_info['display_field'])) $this->_info['display_field'] = $fields[1]; // usually the second field is the display_field... first is the id
}
}
if (empty($prop))
diff --git a/fuel/modules/fuel/libraries/Fuel_pages.php b/fuel/modules/fuel/libraries/Fuel_pages.php
index b7c737ff1..e007ded27 100644
--- a/fuel/modules/fuel/libraries/Fuel_pages.php
+++ b/fuel/modules/fuel/libraries/Fuel_pages.php
@@ -94,9 +94,10 @@ public function set_active(&$page)
*
* @access public
* @param string The page to set as active
+ * @param array An array of initializtion parameters
* @return object
*/
- public function get($location)
+ public function get($location, $init = array())
{
$init['location'] = $location;
$page = $this->create($init, FALSE);
diff --git a/fuel/modules/fuel/libraries/MY_Parser.php b/fuel/modules/fuel/libraries/MY_Parser.php
index 2d1f13959..279324552 100644
--- a/fuel/modules/fuel/libraries/MY_Parser.php
+++ b/fuel/modules/fuel/libraries/MY_Parser.php
@@ -337,6 +337,35 @@ public function _parse_compiled($string, $data, $return = FALSE, $cache_id = NUL
}
// --------------------------------------------------------------------
+
+
+ /**
+ * Returns an array of allowed PHP functions
+ *
+ * @access public
+ * @return array
+ */
+ public function allowed_functions()
+ {
+ return $this->_parser_allowed_php_functions;
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
+ * Returns an array of allowed PHP functions
+ * 1 - Encode tags
+ * 2 - Remove tags
+ * 3 - Allow tags
+ *
+ * @access public
+ * @return int
+ */
+ public function allow_php_tags()
+ {
+ return $this->_parser_allow_php_tags;
+ }
+
}
class MY_Security_Policy extends Dwoo_Security_Policy {
diff --git a/fuel/modules/fuel/libraries/Validator.php b/fuel/modules/fuel/libraries/Validator.php
index a489cd631..608b87550 100644
--- a/fuel/modules/fuel/libraries/Validator.php
+++ b/fuel/modules/fuel/libraries/Validator.php
@@ -129,6 +129,7 @@ public function add_rule($field, $func, $msg, $params = array())
if (empty($params))
{
if (!empty($_POST[$field])) $params = $_POST[$field];
+ if (empty($params[$field]) AND !empty($_FILES[$field])) $params = $_FILES[$field];
}
$rule = new Validator_Rule($func, $msg, $params);
$this->_fields[$field][] = $rule;
diff --git a/fuel/modules/fuel/models/base_module_model.php b/fuel/modules/fuel/models/base_module_model.php
index acb480d70..7d0a8e56e 100644
--- a/fuel/modules/fuel/models/base_module_model.php
+++ b/fuel/modules/fuel/models/base_module_model.php
@@ -690,7 +690,8 @@ public function get_others($display_field, $id = NULL, $val_field = NULL)
if (in_array($CI->language_col, $fields))
{
- $display_field = 'CONCAT('.$display_field.', " - ", '.$CI->language_col.') AS val_field';
+ if (strpos($display_field, '.') === FALSE) $display_field = $this->table_name.'.'.$display_field;
+ $display_field = 'CONCAT('.$display_field.', " - ", '.$this->table_name.'.'.$CI->language_col.') AS val_field';
$orderby = 'val_field ASC';
}
}
@@ -731,7 +732,7 @@ public function get_languages($field = NULL)
{
$this->db->distinct($field);
}
-
+ if (strpos($field, '.') === FALSE) $field = $this->table_name.'.'.$field;
$where[$field.' !='] = '';
$options = $this->options_list($field, $field, $where, TRUE, FALSE);
return $options;
diff --git a/fuel/modules/fuel/models/fuel_assets_model.php b/fuel/modules/fuel/models/fuel_assets_model.php
index d984816e7..e6734eb5c 100644
--- a/fuel/modules/fuel/models/fuel_assets_model.php
+++ b/fuel/modules/fuel/models/fuel_assets_model.php
@@ -403,7 +403,7 @@ public function form_fields($values = array())
$fields['userfile_file_name'] = array('label' => lang('form_label_new_file_name'), 'comment' => lang('assets_comment_filename'));
if ($CI->config->item('assets_allow_subfolder_creation', 'fuel'))
{
- $fields['subfolder'] = array('label' => lang('form_label_subfolder'), 'comment' => lang('assets_comment_filename'));
+ $fields['subfolder'] = array('label' => lang('form_label_subfolder'), 'comment' => lang('assets_comment_subfolder'));
}
$fields['overwrite'] = array('label' => lang('form_label_overwrite'), 'type' => 'checkbox', 'comment' => lang('assets_comment_overwrite'), 'checked' => true, 'value' => '1');
$fields['unzip'] = array('type' => 'checkbox', 'label' => lang('form_label_unzip'), 'comment' => lang('assets_comment_unzip'), 'value' => 1);
diff --git a/fuel/modules/fuel/models/fuel_categories_model.php b/fuel/modules/fuel/models/fuel_categories_model.php
index fc8c950b9..dff45d253 100644
--- a/fuel/modules/fuel/models/fuel_categories_model.php
+++ b/fuel/modules/fuel/models/fuel_categories_model.php
@@ -248,6 +248,30 @@ public function get_children($where = array(), $order = NULL, $limit = NULL, $of
// --------------------------------------------------------------------
+ /**
+ * Magic method that will allow you to return the model object by doing something like $cateogry->get_products(TRUE);
+ *
+ * @access public
+ * @param string field name
+ * @param array arguments
+ * @return mixed
+ */
+ public function __call($method, $args)
+ {
+ if (preg_match("/^get_(.*)/", $method, $found))
+ {
+ $model = $this->get($found[1]);
+ if ($model)
+ {
+ $data = (isset($args[0]) AND $args[0] === TRUE) ? $model : $model->find_all();
+ return $data;
+ }
+ }
+ return parent::__call($method, $args);
+ }
+
+ // --------------------------------------------------------------------
+
/**
* Magic method to return first property, method, then field values
*
diff --git a/fuel/modules/fuel/models/fuel_pages_model.php b/fuel/modules/fuel/models/fuel_pages_model.php
index 6e48e7c25..241c8e5c2 100644
--- a/fuel/modules/fuel/models/fuel_pages_model.php
+++ b/fuel/modules/fuel/models/fuel_pages_model.php
@@ -31,6 +31,7 @@
class Fuel_pages_model extends Base_module_model {
+ public $filter_join = 'and';
public $required = array('location'); // The location field is required
public $unique_fields = array('location'); // The location field is unique
public $hidden_fields = array('last_modified', 'last_modified_by'); // The Last modified and Last modified by are hidden fields
diff --git a/fuel/modules/fuel/models/fuel_tags_model.php b/fuel/modules/fuel/models/fuel_tags_model.php
index 9790a6d84..9a8a3b4fb 100644
--- a/fuel/modules/fuel/models/fuel_tags_model.php
+++ b/fuel/modules/fuel/models/fuel_tags_model.php
@@ -169,17 +169,17 @@ public function options_list($key = 'id', $val = 'name', $where = array(), $orde
{
$this->db->join($this->_tables['fuel_categories'], $this->_tables['fuel_categories'].'.id = '.$this->_tables['fuel_tags'].'.category_id', 'LEFT');
- if (empty($key)) $key = 'id';
- if (empty($val)) $val = 'name';
+ if (empty($key)) $key = $this->_tables['fuel_categories'].'.id';
+ if (empty($val)) $val = $this->_tables['fuel_categories'].'.name';
// needed to prevent ambiguity
- if (strpos($key, '.') === FALSE)
+ if (strpos($key, '.') === FALSE AND strpos($key, '(') === FALSE)
{
$key = $this->_tables['fuel_tags'].'.'.$key;
}
// needed to prevent ambiguity
- if (strpos($val, '.') === FALSE)
+ if (strpos($val, '.') === FALSE AND strpos($val, '(') === FALSE)
{
$val = $this->_tables['fuel_tags'].'.'.$val;
}
diff --git a/fuel/modules/fuel/views/_blocks/fuel_footer.php b/fuel/modules/fuel/views/_blocks/fuel_footer.php
index e7aea1e1d..c926f41f4 100644
--- a/fuel/modules/fuel/views/_blocks/fuel_footer.php
+++ b/fuel/modules/fuel/views/_blocks/fuel_footer.php
@@ -1,6 +1,3 @@
-
fuel->config('fuel_javascript'); ?>
$j) : echo js(array($m => $j))."\n\t"; endforeach; ?>
diff --git a/fuel/modules/fuel/views/_blocks/fuel_header.php b/fuel/modules/fuel/views/_blocks/fuel_header.php
index 40b432410..fb9f6c7be 100644
--- a/fuel/modules/fuel/views/_blocks/fuel_header.php
+++ b/fuel/modules/fuel/views/_blocks/fuel_header.php
@@ -12,4 +12,8 @@
$c) : echo css(array($m => $c))."\n\t"; endforeach; ?>
+
+
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/general/javascript.php b/fuel/modules/fuel/views/_docs/general/javascript.php
index da6e784bc..444085059 100644
--- a/fuel/modules/fuel/views/_docs/general/javascript.php
+++ b/fuel/modules/fuel/views/_docs/general/javascript.php
@@ -114,7 +114,7 @@
- js_controller: the name of the file and thus controller to use. The default is the BaseFuelController.js
- js_controller_path: the object/folder path to the controller. The default is fuel.controller.BaseFuelController (folder slashes are simply replaced with dots)
- - js_controller_params: an initialization object of parameters to pass to the controller.
+ - js_controller_params: an initialization object of parameters to pass to the controller
- js_localized: an array of localized string keys to be accessible via the fuel.lang() function
diff --git a/fuel/modules/fuel/views/_docs/general/models.php b/fuel/modules/fuel/views/_docs/general/models.php
index da28c8939..5f530efc9 100644
--- a/fuel/modules/fuel/views/_docs/general/models.php
+++ b/fuel/modules/fuel/views/_docs/general/models.php
@@ -525,12 +525,12 @@ function __construct()
By default, FUEL uses the built-in relationships model to save relationship data. However, if you want to change the model, as well as the field names it uses to store the key information,
- you can pass the following parameters in your has_many or belongs_to properties array: fuel_relationships_model, foreign_key, candidate_key. An Example is below:
+ you can pass the following parameters in your has_many or belongs_to properties array: relationships_model, foreign_key, candidate_key. An Example is below:
class Products_model extends Base_module_model
{
- public $has_many = array('attributes' => array('model' => array(FUEL_FOLDER => 'fuel_tags_model'), 'fuel_relationships_model' => 'my_relationship_model', 'foreign_key' => 'my_foreign_key', 'candidate_key' => 'candidate_key'));
+ public $has_many = array('attributes' => array('model' => array(FUEL_FOLDER => 'fuel_tags_model'), 'relationships_model' => 'my_relationship_model', 'foreign_key' => 'my_foreign_key', 'candidate_key' => 'candidate_key'));
function __construct()
{
diff --git a/fuel/modules/fuel/views/_docs/installation/requirements.php b/fuel/modules/fuel/views/_docs/installation/requirements.php
index fcd9dc00d..518973162 100644
--- a/fuel/modules/fuel/views/_docs/installation/requirements.php
+++ b/fuel/modules/fuel/views/_docs/installation/requirements.php
@@ -1,6 +1,6 @@
Server Requirements
- Apache server with .htaccess.
- - PHP version 5.1.6 or greater.
+ - PHP version 5.2 or greater.
- A MySQL 4+ database if using the FUEL admin. Currently does not support other databases.
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_docs/modules/tutorial.php b/fuel/modules/fuel/views/_docs/modules/tutorial.php
index 7fa788e73..747492dab 100644
--- a/fuel/modules/fuel/views/_docs/modules/tutorial.php
+++ b/fuel/modules/fuel/views/_docs/modules/tutorial.php
@@ -233,7 +233,7 @@ class Article_model extends Base_module_record {
echo $tag->name;
}
-In the latter example above, the record property tags can be called as a method as well by pre-pending "get_" in front of the properties name (e.g. get_tags()).
+
In the latter example above, the record property tags can be called as a method as well by pre-appending "get_" in front of the properties name (e.g. get_tags()).
This allows us to pass additional parameters.
@@ -339,7 +339,7 @@ class and gets passed to a assets/images/articles instead of the default assets/images folder. To make this change,
- you'll need to create that folder and make sure it is writable by PHP. Then you can add the following parameter to the content field in hte form_fields method:
+ you'll need to create that folder and make sure it is writable by PHP. Then you can add the following parameter to the content field in the form_fields method:
function form_fields($values = array(), $related = array())
{
diff --git a/fuel/modules/fuel/views/_generate/advanced/controllers/{module}_module.php b/fuel/modules/fuel/views/_generate/advanced/controllers/{module}_module.php
index 642295057..eb74939cf 100644
--- a/fuel/modules/fuel/views/_generate/advanced/controllers/{module}_module.php
+++ b/fuel/modules/fuel/views/_generate/advanced/controllers/{module}_module.php
@@ -4,20 +4,18 @@
class {model_name}_module extends Fuel_base_controller {
public $nav_selected = '{module}|{module}/:any';
-
function __construct()
{
parent::__construct();
}
-
+
function index()
{
$vars['page_title'] = $this->fuel->admin->page_title(array(lang('module_{module}')), FALSE);
$crumbs = array('tools' => lang('section_tools'), lang('module_{module}'));
- $this->fuel->admin->set_titlebar($crumbs, 'ico_{module}');
- $this->fuel->admin->render('_admin/{module}', $vars);
+ $this->fuel->admin->set_titlebar($crumbs, 'ico_{module}');
+ $this->fuel->admin->render('_admin/{module}', $vars, '', FUEL_FOLDER);
}
-
}
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_generate/advanced/libraries/Fuel_{module}.php b/fuel/modules/fuel/views/_generate/advanced/libraries/Fuel_{module}.php
index 1cfab0a8f..9905f2468 100644
--- a/fuel/modules/fuel/views/_generate/advanced/libraries/Fuel_{module}.php
+++ b/fuel/modules/fuel/views/_generate/advanced/libraries/Fuel_{module}.php
@@ -20,7 +20,7 @@
// ------------------------------------------------------------------------
class Fuel_{module} extends Fuel_advanced_module {
-
+
public $name = "{module}"; // the folder name of the module
/**
@@ -33,9 +33,9 @@ function __construct($params = array())
parent::__construct();
$this->initialize($params);
}
-
+
// --------------------------------------------------------------------
-
+
/**
* Initialize the backup object
*
@@ -53,10 +53,9 @@ function initialize($params)
}
// --------------------------------------------------------------------
-
+
/**
* Add your custom methods for this advanced module below.
* You will be able to access it via $this->fuel->{module}->my_method()
- */
-
+ */
}
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_generate/advanced/views/_docs/index.php b/fuel/modules/fuel/views/_generate/advanced/views/_docs/index.php
index dfdc74663..7a1b4eed4 100644
--- a/fuel/modules/fuel/views/_generate/advanced/views/_docs/index.php
+++ b/fuel/modules/fuel/views/_generate/advanced/views/_docs/index.php
@@ -3,6 +3,4 @@
-
-
-
+
\ No newline at end of file
diff --git a/fuel/modules/fuel/views/_generate/model/{model}_model.php b/fuel/modules/fuel/views/_generate/model/{model}_model.php
index 4ef1aa63b..d89a2f189 100644
--- a/fuel/modules/fuel/views/_generate/model/{model}_model.php
+++ b/fuel/modules/fuel/views/_generate/model/{model}_model.php
@@ -29,7 +29,7 @@ function __construct()
parent::__construct('{table}'); // table name
}
- function list_items($limit = NULL, $offset = NULL, $col = 'precedence', $order = 'desc', $just_count = FALSE)
+ function list_items($limit = NULL, $offset = NULL, $col = 'precedence', $order = 'asc', $just_count = FALSE)
{
$data = parent::list_items($limit, $offset, $col, $order, $just_count = FALSE);
return $data;
diff --git a/fuel/modules/fuel/views/login.php b/fuel/modules/fuel/views/login.php
index 7409fcd98..f2fc58a69 100644
--- a/fuel/modules/fuel/views/login.php
+++ b/fuel/modules/fuel/views/login.php
@@ -9,7 +9,7 @@
diff --git a/fuel/modules/fuel/views/pages/page_create_edit.php b/fuel/modules/fuel/views/pages/page_create_edit.php
index 89eda47b3..84b3d5d9d 100644
--- a/fuel/modules/fuel/views/pages/page_create_edit.php
+++ b/fuel/modules/fuel/views/pages/page_create_edit.php
@@ -1,4 +1,4 @@
-load->view('_blocks/related_items'); ?>
+load->module_view(FUEL_FOLDER, '_blocks/related_items'); ?>
?>)
?>)