Revision 1238
Added by Dietmar over 14 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
| 14 | 14 |
11-Jan-2010 Dietmar Woellbrink (Luisehahne) |
| 15 |
! fix load_module, load_language (tks to Webbird) |
|
| 16 |
11-Jan-2010 Dietmar Woellbrink (Luisehahne) |
|
| 15 | 17 |
! Ticket #904 fix if templatename is equal language |
| 16 | 18 |
11-Jan-2010 Dietmar Woellbrink (Luisehahne) |
| 17 | 19 |
! Ticket #905 fix search.php 'registered' hardcoded |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 2 | 2 |
/**************************************************************************** |
| 3 | 3 |
* SVN Version information: |
| 4 | 4 |
* |
| 5 |
* $Id: version.php 1236 2010-01-11 12:37:12Z Luisehahne $
|
|
| 5 |
* $Id: version.php 1237 2010-01-11 12:37:12Z Luisehahne $
|
|
| 6 | 6 |
* |
| 7 | 7 |
* |
| 8 | 8 |
* |
| ... | ... | |
| 56 | 56 |
* @author Ryan Djurovich |
| 57 | 57 |
* @copyright 2004-2009, Ryan Djurovich |
| 58 | 58 |
* @copyright 2009-2010, Website Baker Org. e.V. |
| 59 |
* @version $Id: version.php 1236 2010-01-11 12:37:12Z Luisehahne $
|
|
| 59 |
* @version $Id: version.php 1237 2010-01-11 12:37:12Z Luisehahne $
|
|
| 60 | 60 |
* @platform WebsiteBaker 2.8.x |
| 61 | 61 |
* @requirements >= PHP 4.3.4 |
| 62 | 62 |
* @license http://www.gnu.org/licenses/gpl.html |
| ... | ... | |
| 70 | 70 |
|
| 71 | 71 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 72 | 72 |
if(!defined('VERSION')) define('VERSION', '2.8.1');
|
| 73 |
if(!defined('REVISION')) define('REVISION', '1237');
|
|
| 73 |
if(!defined('REVISION')) define('REVISION', '1238');
|
|
| 74 | 74 |
|
| 75 | 75 |
?> |
| branches/2.8.x/wb/framework/functions.php | ||
|---|---|---|
| 851 | 851 |
if(!isset($module_function) AND isset($module_type)) { $module_function = $module_type; }
|
| 852 | 852 |
$module_function = strtolower($module_function); |
| 853 | 853 |
// Check that it doesn't already exist |
| 854 |
$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$module_directory."' LIMIT 0,1");
|
|
| 854 |
$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND directory = '".$module_directory."' LIMIT 0,1");
|
|
| 855 | 855 |
if($result->numRows() == 0) |
| 856 | 856 |
{
|
| 857 | 857 |
// Load into DB |
| ... | ... | |
| 904 | 904 |
if(!isset($language_license)) { $language_license = 'GNU General Public License'; }
|
| 905 | 905 |
if(!isset($language_platform) AND isset($language_designed_for)) { $language_platform = $language_designed_for; }
|
| 906 | 906 |
// Check that it doesn't already exist |
| 907 |
$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE directory = '".$language_code."' LIMIT 0,1");
|
|
| 907 |
$result = $database->query("SELECT addon_id FROM ".TABLE_PREFIX."addons WHERE type = 'language' AND directory = '".$language_code."' LIMIT 0,1");
|
|
| 908 | 908 |
if($result->numRows() == 0) {
|
| 909 | 909 |
// Load into DB |
| 910 | 910 |
$query = "INSERT INTO ".TABLE_PREFIX."addons ". |
Also available in: Unified diff
fix load_module, load_language (tks to Webbird)