Revision 1917
Added by Dietmar over 11 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
12 | 12 |
=============================================================================== |
13 | 13 |
|
14 | 14 |
|
15 |
07 Jun-2013 Build 1917 Dietmar Woellbrink (Luisehahne) |
|
16 |
! /modules/show_menu2/ set to version 4.9.7 |
|
17 |
DEBUG == true show query counts |
|
15 | 18 |
07 Jun-2013 Build 1916 Dietmar Woellbrink (Luisehahne) |
16 | 19 |
! /modules/droplets/ set to version 1.3.0 |
17 | 20 |
installing module with sql import |
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', '1916');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1917');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/modules/show_menu2/info.php | ||
---|---|---|
3 | 3 |
* |
4 | 4 |
* @category module |
5 | 5 |
* @package show_menu2 |
6 |
* @author Brodie Thiesfield |
|
6 | 7 |
* @author WebsiteBaker Project |
7 |
* @copyright 2004-2009, Ryan Djurovich |
|
8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
9 |
* @link http://www.websitebaker2.org/ |
|
8 |
* @copyright 2009-2013, WebsiteBaker Org. e.V. |
|
9 |
* @link http://www.websitebaker.org/ |
|
10 | 10 |
* @license http://www.gnu.org/licenses/gpl.html |
11 |
* @platform WebsiteBaker 2.7.0
|
|
11 |
* @platform WebsiteBaker 2.8.4
|
|
12 | 12 |
* @requirements PHP 5.2.2 and higher |
13 | 13 |
* @version $Id$ |
14 |
* @filesource $HeadURL$
|
|
14 |
* @filesource $HeadURL$
|
|
15 | 15 |
* @lastmodified $Date$ |
16 | 16 |
* |
17 | 17 |
*/ |
... | ... | |
19 | 19 |
$module_directory = 'show_menu2'; |
20 | 20 |
$module_name = 'show_menu2'; |
21 | 21 |
$module_function = 'snippet'; |
22 |
$module_version = '4.9.6';
|
|
23 |
$module_platform = '2.7 | 2.8.2';
|
|
22 |
$module_version = '4.9.7';
|
|
23 |
$module_platform = '2.8.4';
|
|
24 | 24 |
$module_author = 'Brodie Thiesfield'; |
25 | 25 |
$module_license = 'GNU General Public License'; |
26 | 26 |
$module_description = 'A code snippet for the Website Baker CMS providing a complete replacement for the builtin menu functions. See <a href="http://code.jellycan.com/show_menu2/" target="_blank">http://code.jellycan.com/show_menu2/</a> for details or view the <a href="' .WB_URL .'/modules/show_menu2/README.en.txt" target="_blank">readme</a> file.'; |
27 |
|
branches/2.8.x/wb/modules/show_menu2/include.php | ||
---|---|---|
4 | 4 |
* @category module |
5 | 5 |
* @package show_menu2 |
6 | 6 |
* @author WebsiteBaker Project |
7 |
* @copyright 2004-2009, Ryan Djurovich
|
|
8 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
9 |
* @link http://www.websitebaker2.org/
|
|
7 |
* @copyright Brodie Thiesfield
|
|
8 |
* @copyright 2009-2013, WebsiteBaker Org. e.V.
|
|
9 |
* @link http://www.websitebaker.org/
|
|
10 | 10 |
* @license http://www.gnu.org/licenses/gpl.html |
11 | 11 |
* @platform WebsiteBaker 2.7.0 | 2.8.x |
12 | 12 |
* @requirements PHP 5.2.2 and higher |
13 | 13 |
* @version $Id$ |
14 |
* @filesource $HeadURL$
|
|
14 |
* @filesource $HeadURL$
|
|
15 | 15 |
* @lastmodified $Date$ |
16 | 16 |
* |
17 | 17 |
*/ |
... | ... | |
444 | 444 |
) |
445 | 445 |
{ |
446 | 446 |
global $wb; |
447 |
|
|
447 |
$database = WbDatabase::getInstance(); |
|
448 |
$iQueryStart = $database->getQueryCount; |
|
448 | 449 |
// extract the flags and set $aOptions to an array |
449 | 450 |
$flags = 0; |
450 | 451 |
if (is_int($aOptions)) { |
... | ... | |
722 | 723 |
if (($flags & SM2_NOCACHE) != 0) { |
723 | 724 |
unset($GLOBALS['show_menu2_data'][$aMenu]); |
724 | 725 |
} |
725 |
|
|
726 |
if(defined('DEBUG') && (DEBUG)) { |
|
727 |
$iQueriesDone = $database->getQueryCount - $iQueryStart; |
|
728 |
return $retval."\n".'<!-- Queries: '.$iQueriesDone.' -->'."\n"; |
|
729 |
} |
|
726 | 730 |
return $retval; |
727 | 731 |
} |
728 | 732 |
|
Also available in: Unified diff
! /modules/show_menu2/ set to version 4.9.7
DEBUG == true show query counts