Commit 8ff86abc authored by jonnybradley's avatar jonnybradley

[MOD] Moved & renamed tiki-parsemode.php to lib/setup/editmode.php

parent 4a59ce46
......@@ -2226,6 +2226,7 @@ lib/setup/compat.php -text
lib/setup/cookies.php -text
lib/setup/default_homepage.php -text
lib/setup/dynamic_variables.php -text
lib/setup/editmode.php -text
lib/setup/error_reporting.php -text
lib/setup/freetags.php -text
lib/setup/fullscreen.php -text
......@@ -4405,7 +4406,6 @@ tests/upgrade_categperm.php -text
/tiki-page.php -text
/tiki-page_loader.php -text
/tiki-pagehistory.php -text
/tiki-parsemode_setup.php -text
/tiki-phpinfo.php -text
/tiki-pick_avatar.php -text
/tiki-plugins.php -text
......
<?php
// $Id$
// (c) Copyright 2002-2009 by authors of the Tiki Wiki/CMS/Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id: /cvsroot/tikiwiki/tiki/tiki-parsemode_setup.php,v 1.5.2.1 2008-01-15 21:06:59 nkoth Exp $
// $Id$
if (strpos($_SERVER['SCRIPT_NAME'], basename(__FILE__)) != FALSE) {
header('location: index.php');
exit;
......
......@@ -26,7 +26,7 @@ function smarty_block_textarea($params, $content, &$smarty, $repeat) {
if ( $prefs['javascript_enabled'] != 'y') $params['_toolbars'] = 'n';
if (!isset($params['_wysiwyg'])) { // should not be set usually(?)
include_once 'tiki-parsemode_setup.php';
include_once 'lib/setup/editmode.php';
$params['_wysiwyg'] = $_SESSION['wysiwyg'];
}
......
......@@ -171,7 +171,7 @@ $smarty->assign_by_ref('sort_mode', $sort_mode);
$channels = $templateslib->list_all_templates($offset, $maxRecords, $sort_mode, $find);
$smarty->assign_by_ref('cant_pages', $channels["cant"]);
// wysiwyg decision
include 'tiki-parsemode_setup.php';
include 'lib/setup/editmode.php';
$smarty->assign_by_ref('channels', $channels["data"]);
include_once ("textareasize.php");
ask_ticket('admin-content-templates');
......
......@@ -53,7 +53,7 @@ if ($prefs['feature_wikiapproval'] == 'y' && substr($_REQUEST['page'], 0, strlen
$page = $_REQUEST["page"];
$info = $tikilib->get_page_info($page);
// wysiwyg decision
include 'tiki-parsemode_setup.php';
include 'lib/setup/editmode.php';
$smarty->assign_by_ref('page', $_REQUEST["page"]);
// Permissions
......
......@@ -73,7 +73,7 @@ if ($info['parse_mode'] == 'raw') {
$info['parsed'] = nl2br(htmlspecialchars($info['data']));
$smarty->assign('wysiwyg', 'n');
} else {
include 'tiki-parsemode_setup.php';
include 'lib/setup/editmode.php';
$info['parsed'] = $tikilib->parse_data($info['data'], array('is_html' => $is_html));
}
$smarty->assign('noteId', $_REQUEST["noteId"]);
......
......@@ -27,7 +27,7 @@ if (isset($_REQUEST["remove"])) {
check_ticket('notepad-write');
$notepadlib->remove_note($user, $_REQUEST['remove']);
}
include 'tiki-parsemode_setup.php';
include 'lib/setup/editmode.php';
if ($_REQUEST["noteId"]) {
$info = $notepadlib->get_note($user, $_REQUEST["noteId"]);
if ($info['parse_mode'] == 'raw') {
......
......@@ -89,7 +89,7 @@ if (isset($_REQUEST["remove"])) {
}
}
// wysiwyg decision
include 'tiki-parsemode_setup.php';
include 'lib/setup/editmode.php';
if (isset($_REQUEST["templateId"]) && $_REQUEST["templateId"] > 0 && (!isset($_REQUEST['previousTemplateId']) || $_REQUEST['previousTemplateId'] != $_REQUEST['templateId'])) {
$template_data = $tikilib->get_template($_REQUEST["templateId"]);
......
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