mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

removed TinyMce specific code from headers - now loads from e_meta.php

Browse Source
This commit is contained in:
CaMer0n
2006-12-22 18:47:10 +00:00
parent a2b06eeaa1
commit 4d80394094
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_admin/header.php
View File

@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.5 $ | $Revision: 1.6 $
| $Date: 2006-12-07 16:18:51 $ | $Date: 2006-12-22 18:47:10 $
| $Author: sweetas $ | $Author: e107coders $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -129,9 +129,7 @@ echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off. // Wysiwyg JS support on or off.
// your code should run off e_WYSIWYG // your code should run off e_WYSIWYG
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") { if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE); define("e_WYSIWYG",TRUE);
echo wysiwyg($e_wysiwyg);
}else{ }else{
define("e_WYSIWYG",FALSE); define("e_WYSIWYG",FALSE);
} }
@@ -185,8 +183,8 @@ if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE && isset($pref['
echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n"; echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
} }
else else
{ {
$css_file = file_exists(THEME.'admin_style.css') ? THEME_ABS.'admin_style.css' : THEME_ABS.'style.css'; $css_file = file_exists(THEME.'admin_style.css') ? THEME_ABS.'admin_style.css' : THEME_ABS.'style.css';
echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n"; echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
@@ -266,7 +264,7 @@ if(!isset($e107_popup))
$e107_popup = 0; $e107_popup = 0;
} }
if ($e107_popup != 1) { if ($e107_popup != 1) {
// //
// L: (optional) Body JS to disable right clicks [reserved; user mode] // L: (optional) Body JS to disable right clicks [reserved; user mode]
@@ -459,4 +457,4 @@ if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
} }
$sql->db_Mark_Time('(End: Parse Admin Header)'); $sql->db_Mark_Time('(End: Parse Admin Header)');
} }
?> ?>

10
e107_themes/templates/header_default.php
View File

@@ -6,9 +6,9 @@
| Released under the terms and conditions of the GNU General Public License (http://gnu.org). | Released under the terms and conditions of the GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $ | $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
| $Revision: 1.3 $ | $Revision: 1.4 $
| $Date: 2006-12-07 12:53:49 $ | $Date: 2006-12-22 18:47:10 $
| $Author: mrpete $ | $Author: e107coders $
+-----------------------------------------------------------------------------------------------+ +-----------------------------------------------------------------------------------------------+
*/ */
@@ -91,9 +91,7 @@ echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off. // Wysiwyg JS support on or off.
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") { if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE); define("e_WYSIWYG",TRUE);
echo wysiwyg($e_wysiwyg);
}else{ }else{
define("e_WYSIWYG",FALSE); define("e_WYSIWYG",FALSE);
} }
@@ -307,7 +305,7 @@ if(!isset($e107_popup))
$e107_popup = 0; $e107_popup = 0;
} }
if ($e107_popup != 1) { if ($e107_popup != 1) {
// //
// L: (optional) Body JS to disable right clicks // L: (optional) Body JS to disable right clicks
// //