Changeset 1446 for branches/newtoken/wifidog/classes/ContentTypeFilter.php

Timestamp:

02/11/10 17:34:27 (2 years ago)

Author:

gbastien

Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

• can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
• Users connected through a wifidog gateway can view their connection token information

Files:

• branches/newtoken/wifidog/classes/ContentTypeFilter.php (modified) (1 diff)

branches/newtoken/wifidog/classes/ContentTypeFilter.php

@@ -288 +288 @@
 
                 !empty($userData['preSelectedId'])?$selectedId=$userData['preSelectedId']:$selectedId=null;
-                !empty($userData['additionalWhere'])?$additional_where=$userData['additionalWhere']:$additional_where=null;
+                !empty($userData['additionalWhere'])?$additional_where=$userData['additionalWhere']:$additional_where='';
                 
                 $additional_where = $db->escapeString($additional_where);