Commit b95a9f40 authored by merlinofchaos's avatar merlinofchaos

Issue #1234010 by das-peter: Fix typo in ctools_var_export.

parent e909f434
......@@ -668,7 +668,7 @@ function ctools_var_export($var, $prefix = '') {
// magic method __set_state() leaving the export broken. This
// workaround avoids this by casting the object as an array for
// export and casting it back to an object when evaluated.
$output .= '(object) ' . ctools_var_export((array) $var, $prefix);
$output = '(object) ' . ctools_var_export((array) $var, $prefix);
}
else if (is_bool($var)) {
$output = $var ? 'TRUE' : 'FALSE';
......
......@@ -90,14 +90,8 @@ function views_content_views_row_edit(&$form, &$form_state) {
return;
}
// Support Views 2 and Views 3.
if (method_exists($view, 'get_items_per_page')) {
$view->init_pager();
$rows = $view->get_items_per_page();
}
else {
$rows = $view->display_handler->get_option('items_per_page');
}
$rows = $view->get_items_per_page();
if (empty($rows)) {
$form['markup'] = array('#value' => '<p>' . t('The view must have a maximum number of items set to use this content type.') . '</p>');
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment