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

Bugfix #3568 - wysiwyg was not being tested for properly.

Browse Source 
in content, removed old wysiwyg detection and js download code.
This commit is contained in:
mrpete
2006-12-07 12:57:43 +00:00
parent 6285cd3571
commit 583c71d06e
2 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_plugins/content/content_manager.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_plugins/content/content_manager.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/content/content_manager.php,v $
| $Revision: 1.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:34:54 $ | $Date: 2006-12-07 12:57:43 $
| $Author: mcfly_e107 $ | $Author: mrpete $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -65,20 +65,10 @@ if(isset($_POST['delete'])){
//these have to be set for the tinymce wysiwyg //these have to be set for the tinymce wysiwyg
$e_wysiwyg = "content_text"; $e_wysiwyg = "content_text";
//if(check_class($pref['post_html']) && $pref['wysiwyg'] && $e_wysiwyg == TRUE){
if($pref['wysiwyg'] && $e_wysiwyg == TRUE){
require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE);
$tiny = wysiwyg($e_wysiwyg);
}else{
define("e_WYSIWYG",FALSE);
}
//include js //include js
function headerjs(){ function headerjs(){
global $tiny;
echo "<script type='text/javascript' src='".e_FILE."popup.js'></script>\n"; echo "<script type='text/javascript' src='".e_FILE."popup.js'></script>\n";
echo $tiny;
} }
// ##### DB --------------------------------------------------------------------------------------- // ##### DB ---------------------------------------------------------------------------------------

20
e107_plugins/content/content_submit.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_plugins/content/content_submit.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/content/content_submit.php,v $
| $Revision: 1.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:34:55 $ | $Date: 2006-12-07 12:57:43 $
| $Author: mcfly_e107 $ | $Author: mrpete $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -39,20 +39,6 @@ $eArrayStorage = new ArrayData();
//these have to be set for the tinymce wysiwyg //these have to be set for the tinymce wysiwyg
$e_wysiwyg = "content_text"; $e_wysiwyg = "content_text";
if(check_class($pref['post_html']) && $pref['wysiwyg'] && $e_wysiwyg == TRUE){
require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE);
$tiny = wysiwyg($e_wysiwyg);
}else{
define("e_WYSIWYG",FALSE);
}
//include js
function headerjs(){
global $tiny;
echo $tiny;
}
global $tp; global $tp;
$lan_file = $plugindir.'languages/'.e_LANGUAGE.'/lan_content.php'; $lan_file = $plugindir.'languages/'.e_LANGUAGE.'/lan_content.php';