Revision 1758
Added by Dietmar about 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
|
| 16 |
16 Sep-2012 Build 1758 Dietmar Woellbrink (Luisehahne) |
|
| 17 |
! forgot to upload the install.php from wysiwyg modul in Revision 1756 |
|
| 18 |
! correcting some more SEC_ANCHOR |
|
| 16 | 19 |
16 Sep-2012 Build 1757 Dietmar Woellbrink (Luisehahne) |
| 17 | 20 |
# fixed mysql_fetch_array() expects parameter 1 to be resource, boolean given |
| 18 | 21 |
by adding a new form on page, |
| branches/2.8.x/wb/admin/pages/modify.php | ||
|---|---|---|
| 230 | 230 |
} |
| 231 | 231 |
} |
| 232 | 232 |
|
| 233 |
$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? 'id="'.SEC_ANCHOR.$section['section_id'].'"' : '');
|
|
| 233 |
$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? 'id="'.SEC_ANCHOR.$section['section_id'].'"' : 'section_'.$section_id);
|
|
| 234 | 234 |
print '<div class="section-info" '.$sec_anchor.' ><b>' . $TEXT['BLOCK'] . ': </b>' . $block_name; |
| 235 | 235 |
print '<b> Modul: </b>' . $section['module']." "; |
| 236 | 236 |
print '<b> ID: </b>' . $section_id."</div>\n"; |
| branches/2.8.x/wb/admin/pages/sections.php | ||
|---|---|---|
| 323 | 323 |
{
|
| 324 | 324 |
$edit_page = ''; |
| 325 | 325 |
} |
| 326 |
$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : ''); |
|
| 326 |
$sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'section_');
|
|
| 327 | 327 |
$edit_page_0 = '<a id="sid'.$section['section_id'].'" href="'.ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id']; |
| 328 | 328 |
$edit_page_1 = ($sec_anchor!='') ? '#'.$sec_anchor.$section['section_id'].'">' : '">'; |
| 329 | 329 |
$edit_page_1 .= $section['module'].'</a>'; |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1757');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1758');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/modules/wysiwyg/install.php | ||
|---|---|---|
| 19 | 19 |
if(!defined('WB_PATH')) {
|
| 20 | 20 |
require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); |
| 21 | 21 |
throw new IllegalFileException(); |
| 22 |
} |
|
| 23 |
/* -------------------------------------------------------- */ |
|
| 24 |
|
|
| 25 |
if(defined('WB_URL'))
|
|
| 26 |
{
|
|
| 22 |
} else {
|
|
| 27 | 23 |
// Create table |
| 28 |
//$database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`");
|
|
| 29 |
$mod_wysiwyg = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wysiwyg` ( ' |
|
| 30 |
. ' `section_id` INT NOT NULL DEFAULT \'0\',' |
|
| 31 |
. ' `page_id` INT NOT NULL DEFAULT \'0\',' |
|
| 32 |
. ' `content` LONGTEXT NOT NULL ,' |
|
| 33 |
. ' `text` LONGTEXT NOT NULL ,' |
|
| 34 |
. ' PRIMARY KEY ( `section_id` ) ' |
|
| 35 |
. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; |
|
| 36 |
$database->query($mod_wysiwyg); |
|
| 37 | 24 |
|
| 25 |
$database->SqlImport(dirname(__FILE__).'/sql/mod_wysiwyg.sql',TABLE_PREFIX,false); |
|
| 26 |
|
|
| 38 | 27 |
// remove old version of search (deprecated) |
| 39 |
// $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'wysiwyg'"; |
|
| 40 |
// $insert_search = $database->query($mod_search); |
|
| 41 |
// if( $insert_search->numRows() == 0 ) |
|
| 42 |
// {
|
|
| 43 |
// // Insert info into the search table |
|
| 44 |
// // Module query info |
|
| 45 |
// $field_info = array(); |
|
| 46 |
// $field_info['page_id'] = 'page_id'; |
|
| 47 |
// $field_info['title'] = 'page_title'; |
|
| 48 |
// $field_info['link'] = 'link'; |
|
| 49 |
// $field_info['description'] = 'description'; |
|
| 50 |
// $field_info['modified_when'] = 'modified_when'; |
|
| 51 |
// $field_info['modified_by'] = 'modified_by'; |
|
| 52 |
// $field_info = serialize($field_info); |
|
| 53 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')");
|
|
| 54 |
// // Query start |
|
| 55 |
// $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_wysiwyg, [TP]pages WHERE "; |
|
| 56 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')");
|
|
| 57 |
// // Query body |
|
| 58 |
// $query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; |
|
| 59 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')");
|
|
| 60 |
// // Query end |
|
| 61 |
// $query_end_code = ""; |
|
| 62 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')");
|
|
| 63 |
// |
|
| 64 |
// // Insert blank row (there needs to be at least on row for the search to work) |
|
| 65 |
// $database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')");
|
|
| 66 |
// } |
|
| 28 |
|
|
| 67 | 29 |
} |
Also available in: Unified diff
! forgot to upload the install.php from wysiwyg modul in Revision 1756
! correcting some more SEC_ANCHOR