Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed issue #3237 #3239

Closed
wants to merge 172 commits into from
Closed

fixed issue #3237 #3239

wants to merge 172 commits into from

Conversation

Guite
Copy link
Member

@Guite Guite commented Dec 3, 2016

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Fixed tickets #3237
Refs tickets -
License MIT
Changelog updated yes

jguille2 and others added 30 commits December 22, 2013 18:45
@jguille2
fixing #1486 for 1.3.6 on release-1.3 branch
77fcffb
Merge pull request #1502 from jguille2/release-1.3
d8ebd18 
fixing #1486 for 1.3.6 on release-1.3 branch
@jguille2
Adding old hacks (not included into 1.3.6) into release-1.3 branch
d7a698e
Merge pull request #1511 from jguille2/release-1.3
13305aa 
Adding old hacks (not included into 1.3.6) into release-1.3 branch
@rojblake
replace use of serialize functions with json
6c120d0
Merge pull request #4 from rojblake/serialize_fix
0078e44 
replace use of serialize functions with json
@rojblake
replace use of serialize functions with json
c8037c2
Merge commit '0078e4449e0e7c6670dc3d354b3d1ea3496d9419' into release-1.3
668071f
@Guite
replaced un/serialize method by json_en/decode
8f41331
@Guite
Update User.php
45e2b26 
Added parameter to retrieve an array
@Guite
Update SecurityUtil.php
bdf7fde
@espaan
[release-1.3] Refers to #666 fix for IE<10 login problems
1346510 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | -
| Fixed tickets | -
| Refs tickets  | #666
| License       | MIT
| Doc PR        | -

This fixes the problem that hte login window in IE<10 is broken when you switch on generating template comments into the output.

The issue is described clearly in the #666 ticket.
@rallek
workflow fix
be16503 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #704
| License       | MIT
| Doc PR        |
@rallek
drag and drop fix for extmenu
3d081c9 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #924
| License       | MIT
| Doc PR        |

see also https://gist.github.com/cmfcmf/6329308
@rallek
Fixed Block filtering in 1.3.5/6
6715748 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #516, #938
| License       | MIT
| Doc PR        |
@rallek
Fixed displaying of selection boxes
2ca1a5b 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #762
| Refs tickets  | #775
| License       | MIT
| Doc PR        |
@rallek
added jpeg
64f0cd8 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #783
| License       | MIT
| Doc PR        |
@rallek
Avoid flush by category selector
a2b3e3a 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #1561
| License       | MIT
| Doc PR        |
@rallek
some more fixes
dd0036b 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  |
| License       | MIT
| Doc PR        |

do not know the tickets of this fixes
Merge pull request #1599 from espaan/patch-28
709f36b 
This PR was merged into zikula:release-1.3 branch.

Discussion
----------

[release-1.3] Refers to #666 fix for IE<10 login problems

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | -
| Fixed tickets | -
| Refs tickets  | #666
| License       | MIT
| Doc PR        | -

This fixes the problem that hte login window in IE<10 is broken when you switch on generating template comments into the output.

The issue is described clearly in the #666 ticket.

Commits
-------

1346510 [release-1.3] Refers to #666 fix for IE<10 login problems

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | -
| Fixed tickets | -
| Refs tickets  | #666
| License       | MIT
| Doc PR        | -

This fixes the problem that hte login window in IE<10 is broken when you switch on generating template comments into the output.

The issue is described clearly in the #666 ticket. espaan
@rallek
Update users_user_login.tpl
2f519ce 
``|safetext`` added
@rallek
Update users_block_login.tpl
966e29b 
``|safetext`` added
@rallek
Update CategorySelector.php
b05529e 
``public `` added
thanks to cmf!
@rallek
Update PageUtil.php
20383d0 
Korinthen for cmf ;-)
Merge pull request #1601 from rallek/release-1.3
79d8c78 
This PR was merged into zikula:release-1.3 branch.

Discussion
----------

adding my 1.3.6patch repro

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | 
| Refs tickets  | 
| License       | MIT
| Doc PR        | 

this will close my collection at https://github.com/rallek/1.3.6patch

Commits
-------

be16503 workflow fix

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #704
| License       | MIT
| Doc PR        | rallek
3d081c9 drag and drop fix for extmenu

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #924
| License       | MIT
| Doc PR        |

see also https://gist.github.com/cmfcmf/6329308 rallek
6715748 Fixed Block filtering in 1.3.5/6

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #516, #938
| License       | MIT
| Doc PR        | rallek
2ca1a5b Fixed displaying of selection boxes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #762
| Refs tickets  | #775
| License       | MIT
| Doc PR        | rallek
64f0cd8 added jpeg

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #783
| License       | MIT
| Doc PR        | rallek
a2b3e3a Avoid flush by category selector

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #1561
| License       | MIT
| Doc PR        | rallek
dd0036b some more fixes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  |
| License       | MIT
| Doc PR        |

do not know the tickets of this fixes rallek
2f519ce Update users_user_login.tpl

``|safetext`` added rallek
966e29b Update users_block_login.tpl

``|safetext`` added rallek
b05529e Update CategorySelector.php

``public `` added
thanks to cmf! rallek
20383d0 Update PageUtil.php

Korinthen for cmf ;-) rallek
Bump version number
1c5e24d
Update CHANGELOG
fc341ad
@espaan
Backport DBUtil fixes from 1.4 to 1.3
b94c920 
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no, don't think so
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Tested several modules in 1.3.6 that use DBUtil
| Fixed tickets | -
| Refs tickets  | https://github.com/rallek/1.3.6patch/issues/8, #1603
| License       | MIT
| Doc PR        | -

This updates the DBUtil in the 1.3 branch to reflect all the updates @rgasch did to DBUtil in the 1.4 branch. Essentially a backport of the updates done in the 1.4 branch to the 1.3 branch.
It's not a one2one copy since some calls are different in 1.4.0 vs 1.3.x

These updates are needed for zwebstore 1.3.2 for instance and do solve several bugs.
I have tested a bit with News 3.1, Content 4.1 and ZWebstore 1.3.2 that all use DBUtil. That is all ok. If people can test this DBUtil, please do. It should work.

See the list below for the diff between 1.4 and 1.3, left < is 1.3 an right > 1.4
```
16a17,18
>  *
>  * @deprecated
45c47
<             self::$cache_enabled = ServiceUtil::getManager()->getArgument('dbcache.enable');
---
>             self::$cache_enabled = ServiceUtil::getManager()->getParameter('dbcache.enable');
63c65
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
66c68
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
87c89
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
90c92
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
105c107
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
108c110
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
188c190
<         return ServiceUtil::getManager()->getArgument('dbtables');
---
>         return ServiceUtil::getManager()->getParameter('dbtables');
283c285
<             //$stmt->setHydrationMode(Doctrine::HYDRATE_RECORD);
---
>             //$stmt->setHydrationMode(Doctrine_Core::HYDRATE_RECORD);
301,305c303,304
<                 if (System::isLegacyMode()) {
<                     return new Zikula_Adapter_AdodbStatement($result);
<                 } else {
<                     return $result;
<                 }
---
> 
>                 return $result;
999c998
<                 ModUtil::available('Categories')) {
---
>                 ModUtil::available('ZikulaCategoriesModule')) {
1207a1207,1210
>         if ($table == 'categories_mapobj') {
>             // table no longer exists >= 1.3.6
>             return true;
>         }
1242c1245
<                 ModUtil::available('Categories')) {
---
>                 ModUtil::available('ZikulaCategoriesModule')) {
1545c1548
<         $resultRows = $result->fetchAll(Doctrine::FETCH_NUM);
---
>         $resultRows = $result->fetchAll(Doctrine_Core::FETCH_NUM);
1595c1598
<         $resultRows = $result->fetchAll(Doctrine::FETCH_ASSOC);
---
>         $resultRows = $result->fetchAll(Doctrine_Core::FETCH_ASSOC);
1945c1948
<         if (!ModUtil::dbInfoLoad('Categories')) {
---
>         if (!ModUtil::dbInfoLoad('ZikulaCategoriesModule')) {
2382c2385
<         $res = $res->fetchAll(Doctrine::FETCH_COLUMN); // RNG: Should this really be fetchAll() ??
---
>         $res = $res->fetchAll(Doctrine_Core::FETCH_COLUMN); // RNG: Should this really be fetchAll() ??
2782c2785
<         $res   = $res->fetchAll(Doctrine::FETCH_COLUMN);
---
>         $res   = $res->fetchAll(Doctrine_Core::FETCH_COLUMN);
2904c2907
<         if (($enableAllServices || (isset($tables["{$table}_db_extra_enable_categorization"]) && $tables["{$table}_db_extra_enable_categorization"])) && System::getVar('Z_CONFIG_USE_OBJECT_CATEGORIZATION') && strcmp($table, 'categories_') !== 0 && strcmp($table, 'objectdata_attributes') !== 0 && strcmp($table, 'objectdata_log') !== 0 && ModUtil::available('Categories')) {
---
>         if (($enableAllServices || (isset($tables["{$table}_db_extra_enable_categorization"]) && $tables["{$table}_db_extra_enable_categorization"])) && System::getVar('Z_CONFIG_USE_OBJECT_CATEGORIZATION') && strcmp($table, 'categories_') !== 0 && strcmp($table, 'objectdata_attributes') !== 0 && strcmp($table, 'objectdata_log') !== 0 && ModUtil::available('ZikulaCategoriesModule')) {
3914c3917
<                     return z_exit(__f('%1$s: unable to limit tablename [%2$s] because database prefix is too long for Oracle, please shorten it (recommended length is 4 chars)', array(
---
>                     throw new \Exception(__f('%1$s: unable to limit tablename [%2$s] because database prefix is too long for Oracle, please shorten it (recommended length is 4 chars)', array(
4006c4009
< }
---
> }
\ No newline at end of file

```
@rojblake
back-ported fix for deprecated /e modifier to preg_replace refs #889
cd3d6be
Merge pull request #1611 from espaan/patch-31
781c265 
This PR was merged into zikula:1.3 branch.

Discussion
----------

Backport DBUtil fixes from 1.4 to 1.3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no, don't think so
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Tested several modules in 1.3.6 that use DBUtil
| Fixed tickets | -
| Refs tickets  | https://github.com/rallek/1.3.6patch/issues/8, #1603
| License       | MIT
| Doc PR        | -

This updates the DBUtil in the 1.3 branch to reflect all the updates @rgasch did to DBUtil in the 1.4 branch. Essentially a backport of the updates done in the 1.4 branch to the 1.3 branch.
It's not a one2one copy since some calls are different in 1.4.0 vs 1.3.x

These updates are needed for zwebstore 1.3.2 for instance and do solve several bugs.
I have tested a bit with News 3.1, Content 4.1 and ZWebstore 1.3.2 that all use DBUtil. That is all ok. If people can test this DBUtil, please do. It should work.

See the list below for the diff between 1.4 and 1.3, left < is 1.3 an right > 1.4
```
16a17,18
>  *
>  * @deprecated
45c47
<             self::$cache_enabled = ServiceUtil::getManager()->getArgument('dbcache.enable');
---
>             self::$cache_enabled = ServiceUtil::getManager()->getParameter('dbcache.enable');
63c65
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
66c68
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
87c89
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
90c92
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
105c107
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
108c110
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
188c190
<         return ServiceUtil::getManager()->getArgument('dbtables');
---
>         return ServiceUtil::getManager()->getParameter('dbtables');
283c285
<             //$stmt->setHydrationMode(Doctrine::HYDRATE_RECORD);
---
>             //$stmt->setHydrationMode(Doctrine_Core::HYDRATE_RECORD);
301,305c303,304
<                 if (System::isLegacyMode()) {
<                     return new Zikula_Adapter_AdodbStatement($result);
<                 } else {
<                     return $result;
<                 }
---
> 
>                 return $result;
999c998
<                 ModUtil::available('Categories')) {
---
>                 ModUtil::available('ZikulaCategoriesModule')) {
1207a1207,1210
>         if ($table == 'categories_mapobj') {
>             // table no longer exists >= 1.3.6
>             return true;
>         }
1242c1245
<                 ModUtil::available('Categories')) {
---
>                 ModUtil::available('ZikulaCategoriesModule')) {
1545c1548
<         $resultRows = $result->fetchAll(Doctrine::FETCH_NUM);
---
>         $resultRows = $result->fetchAll(Doctrine_Core::FETCH_NUM);
1595c1598
<         $resultRows = $result->fetchAll(Doctrine::FETCH_ASSOC);
---
>         $resultRows = $result->fetchAll(Doctrine_Core::FETCH_ASSOC);
1945c1948
<         if (!ModUtil::dbInfoLoad('Categories')) {
---
>         if (!ModUtil::dbInfoLoad('ZikulaCategoriesModule')) {
2382c2385
<         $res = $res->fetchAll(Doctrine::FETCH_COLUMN); // RNG: Should this really be fetchAll() ??
---
>         $res = $res->fetchAll(Doctrine_Core::FETCH_COLUMN); // RNG: Should this really be fetchAll() ??
2782c2785
<         $res   = $res->fetchAll(Doctrine::FETCH_COLUMN);
---
>         $res   = $res->fetchAll(Doctrine_Core::FETCH_COLUMN);
2904c2907
<         if (($enableAllServices || (isset($tables["{$table}_db_extra_enable_categorization"]) && $tables["{$table}_db_extra_enable_categorization"])) && System::getVar('Z_CONFIG_USE_OBJECT_CATEGORIZATION') && strcmp($table, 'categories_') !== 0 && strcmp($table, 'objectdata_attributes') !== 0 && strcmp($table, 'objectdata_log') !== 0 && ModUtil::available('Categories')) {
---
>         if (($enableAllServices || (isset($tables["{$table}_db_extra_enable_categorization"]) && $tables["{$table}_db_extra_enable_categorization"])) && System::getVar('Z_CONFIG_USE_OBJECT_CATEGORIZATION') && strcmp($table, 'categories_') !== 0 && strcmp($table, 'objectdata_attributes') !== 0 && strcmp($table, 'objectdata_log') !== 0 && ModUtil::available('ZikulaCategoriesModule')) {
3914c3917
<                     return z_exit(__f('%1$s: unable to limit tablename [%2$s] because database prefix is too long for Oracle, please shorten it (recommended length is 4 chars)', array(
---
>                     throw new \Exception(__f('%1$s: unable to limit tablename [%2$s] because database prefix is too long for Oracle, please shorten it (recommended length is 4 chars)', array(
4006c4009
< }
---
> }
\ No newline at end of file

```

Commits
-------

b94c920 Backport DBUtil fixes from 1.4 to 1.3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no, don't think so
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Tested several modules in 1.3.6 that use DBUtil
| Fixed tickets | -
| Refs tickets  | https://github.com/rallek/1.3.6patch/issues/8, #1603
| License       | MIT
| Doc PR        | -

This updates the DBUtil in the 1.3 branch to reflect all the updates @rgasch did to DBUtil in the 1.4 branch. Essentially a backport of the updates done in the 1.4 branch to the 1.3 branch.
It's not a one2one copy since some calls are different in 1.4.0 vs 1.3.x

These updates are needed for zwebstore 1.3.2 for instance and do solve several bugs.
I have tested a bit with News 3.1, Content 4.1 and ZWebstore 1.3.2 that all use DBUtil. That is all ok. If people can test this DBUtil, please do. It should work.

See the list below for the diff between 1.4 and 1.3, left < is 1.3 an right > 1.4
```
16a17,18
>  *
>  * @deprecated
45c47
<             self::$cache_enabled = ServiceUtil::getManager()->getArgument('dbcache.enable');
---
>             self::$cache_enabled = ServiceUtil::getManager()->getParameter('dbcache.enable');
63c65
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
66c68
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
87c89
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
90c92
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
105c107
<             $databases = ServiceUtil::getManager()->getArgument('databases');
---
>             $databases = ServiceUtil::getManager()->getParameter('databases');
108c110
<             $cacheDriver = ServiceUtil::getManager()->getService('doctrine.cachedriver');
---
>             $cacheDriver = ServiceUtil::getManager()->get('doctrine.cachedriver');
188c190
<         return ServiceUtil::getManager()->getArgument('dbtables');
---
>         return ServiceUtil::getManager()->getParameter('dbtables');
283c285
<             //$stmt->setHydrationMode(Doctrine::HYDRATE_RECORD);
---
>             //$stmt->setHydrationMode(Doctrine_Core::HYDRATE_RECORD);
301,305c303,304
<                 if (System::isLegacyMode()) {
<                     return new Zikula_Adapter_AdodbStatement($result);
<                 } else {
<                     return $result;
<                 }
---
> 
>                 return $result;
999c998
<                 ModUtil::available('Categories')) {
---
>                 ModUtil::available('ZikulaCategoriesModule')) {
1207a1207,1210
>         if ($table == 'categories_mapobj') {
>             // table no longer exists >= 1.3.6
>             return true;
>         }
1242c1245
<                 ModUtil::available('Categories')) {
---
>                 ModUtil::available('ZikulaCategoriesModule')) {
1545c1548
<         $resultRows = $result->fetchAll(Doctrine::FETCH_NUM);
---
>         $resultRows = $result->fetchAll(Doctrine_Core::FETCH_NUM);
1595c1598
<         $resultRows = $result->fetchAll(Doctrine::FETCH_ASSOC);
---
>         $resultRows = $result->fetchAll(Doctrine_Core::FETCH_ASSOC);
1945c1948
<         if (!ModUtil::dbInfoLoad('Categories')) {
---
>         if (!ModUtil::dbInfoLoad('ZikulaCategoriesModule')) {
2382c2385
<         $res = $res->fetchAll(Doctrine::FETCH_COLUMN); // RNG: Should this really be fetchAll() ??
---
>         $res = $res->fetchAll(Doctrine_Core::FETCH_COLUMN); // RNG: Should this really be fetchAll() ??
2782c2785
<         $res   = $res->fetchAll(Doctrine::FETCH_COLUMN);
---
>         $res   = $res->fetchAll(Doctrine_Core::FETCH_COLUMN);
2904c2907
<         if (($enableAllServices || (isset($tables["{$table}_db_extra_enable_categorization"]) && $tables["{$table}_db_extra_enable_categorization"])) && System::getVar('Z_CONFIG_USE_OBJECT_CATEGORIZATION') && strcmp($table, 'categories_') !== 0 && strcmp($table, 'objectdata_attributes') !== 0 && strcmp($table, 'objectdata_log') !== 0 && ModUtil::available('Categories')) {
---
>         if (($enableAllServices || (isset($tables["{$table}_db_extra_enable_categorization"]) && $tables["{$table}_db_extra_enable_categorization"])) && System::getVar('Z_CONFIG_USE_OBJECT_CATEGORIZATION') && strcmp($table, 'categories_') !== 0 && strcmp($table, 'objectdata_attributes') !== 0 && strcmp($table, 'objectdata_log') !== 0 && ModUtil::available('ZikulaCategoriesModule')) {
3914c3917
<                     return z_exit(__f('%1$s: unable to limit tablename [%2$s] because database prefix is too long for Oracle, please shorten it (recommended length is 4 chars)', array(
---
>                     throw new \Exception(__f('%1$s: unable to limit tablename [%2$s] because database prefix is too long for Oracle, please shorten it (recommended length is 4 chars)', array(
4006c4009
< }
---
> }
\ No newline at end of file

``` espaan
nmpetkov and others added 28 commits March 26, 2015 16:24
@nmpetkov
Vie plugin moduleheader
5e430b9
@nmpetkov
Changelog entry
d3bd4cc
@craigh
Merge pull request #2371 from nmpetkov/patch13-12-View-plugin-Moduleh…
674bc62 
…eader

View plugin {moduleheader}
@nmpetkov
User theme name in moduleheader
eecc7d2
@Guite
Merge pull request #2395 from nmpetkov/patch13-13-Themename-in-module…
adba8ce 
…header

User theme name in moduleheader
@espaan
Updated noconflict for resolving prototype/jQuery/Bootstrap issues
07b3d88 
See ef34c5b where this was also applied in 1.4.x to solve for instance Bootstrap Tabs disappearing when also using Prototype. For users using Bootstrap (themes) in 1.3.x this solves issues.
@craigh
Merge pull request #2431 from espaan/patch-1
926872b 
Updated noconflict for resolving prototype/jQuery/Bootstrap issues
@Guite
updated locales
7e339f3
@craigh
fixed #2406
ceefba6
@cmfcmf
Delete travis.yml - it does not do anything except for failing anyways..
adefbf4 
@craigh
@nmpetkov
Load correct page theme in case Mobile theme is enabled and Mobile de…
1ac4b43 
…tect is also enabled, but client is not mobile
@nmpetkov
Load correct page theme in case Mobile theme is enabled and Mobile de…
fb93a2d 
…tect is also enabled, but client is not mobile
@craigh
Merge pull request #2583 from nmpetkov/patch13-14-Passed_Theme_proble…
7fa8914 
…m_Printer_RSS

[1.3] Load correct theme in case Mobile theme is enabled and Mobile detect is enabled
@nmpetkov
Changelog entry for #2583
537bca8
@craigh
Merge pull request #2585 from nmpetkov/patch13-14-Passed_Theme_proble…
c47696c 
…m_Printer_RSS

Changelog entry for #2583
@trichers
Include in the {ext} function filtering for CLIP
b92870b 
To use the filter-function in the generated link
@craigh
Merge pull request #2597 from trichers/patch-1
40efc42 
Include in the {ext} function filtering for CLIP
@craigh
add changelog from 1.4 branch
e9368b2
@craigh
update to include changes from src/docs/changelog
87540f5
@craigh
remove old src/docs/CHANGELOG
0c93f28
@craigh
update changelog for newest change #2597
dce3eb9
@nmpetkov
Typo correction in UserUtil.php
cf9d4dc
@craigh
Merge pull request #2660 from nmpetkov/patch13-15-Typo_correction_in_…
6e6c036 
…UserUtil

[1.3] Typo correction in UserUtil.php
@Guite
user block fixed #2891 (#2984)
f8f895b 
* user block fixed #2891

typo was the reason

* entry in changelog
@Guite
Change getPluralOffset to return numbers and not boolean values (#3010)
8ec4737
@Guite
fixed PR number
df474a8
@Guite
clean backslashes to prevent invalid Windows pathes, fixed #3237
e108ef1
@Guite
updated changelog
1d8104c
@Guite Guite added this to the 1.3.11 milestone Dec 3, 2016
@Guite Guite closed this Dec 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.3.11
Development

Successfully merging this pull request may close these issues.