Commit fc85283f authored by changi67's avatar changi67

Notice

parent a287aea0
......@@ -46,7 +46,7 @@ function smarty_block_textarea($params, $content, $smarty, $repeat)
$params['_wysiwyg'] = $_SESSION['wysiwyg'];
}
if ($params['_wysiwyg'] !== 'y') {
if (!isset($params['_wysiwyg']) || $params['_wysiwyg'] !== 'y') {
$params['rows'] = !empty($params['rows']) ? $params['rows'] : 20;
$params['cols'] = !empty($params['cols']) ? $params['cols'] : 80;
}
......@@ -123,7 +123,7 @@ function smarty_block_textarea($params, $content, $smarty, $repeat)
$smarty->assign( 'autosave_js', '');
}
if ( $params['_wysiwyg'] == 'y' && $params['_simple'] == 'n') {
if ( ( isset($params['_wysiwyg']) && $params['_wysiwyg'] == 'y' ) && $params['_simple'] == 'n') {
// new ckeditor implementation 2010
if ($prefs['feature_ajax'] !== 'y' || $prefs['ajax_autosave'] !== 'y' ||
......
......@@ -18,6 +18,7 @@ $all = 0;
if ($_REQUEST["parent"] == 0) {
$parent_name = 'Top';
$all = 1;
$smarty->assign('parent_info', "");
} else {
$parent_info = $dirlib->dir_get_category($_REQUEST['parent']);
$smarty->assign('parent_info', $parent_info);
......
......@@ -522,7 +522,7 @@ if (array($types)) {
$smarty->assign('type', $type);
}
if ($prefs["article_custom_attributes"] == 'y') {
$article_attributes = $artlib->get_article_attributes($_REQUEST["articleId"]);
$article_attributes = $artlib->get_article_attributes($articleId);
$smarty->assign('article_attributes', $article_attributes);
$all_attributes = array();
$js_string = '';
......
......@@ -39,7 +39,7 @@ $info = array();
$info["name"] = '';
$info["description"] = '';
$info["publishDate"] = $tikilib->now;
$cur_time = explode(',', $tikilib->date_format('%Y,%m,%d,%H,%M,%S', $publishDate));
$cur_time = explode(',', $tikilib->date_format('%Y,%m,%d,%H,%M,%S', $info["publishDate"]));
$info["expireDate"] = $tikilib->make_time($cur_time[3], $cur_time[4], $cur_time[5], $cur_time[1], $cur_time[2], $cur_time[0]+1);
$info["canRepeat"] = 'n';
$info["storeResults"] = 'n';
......
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