Skip to content
Browse files

Update (more correct term) method name in user controller and other m…

…inor edits
  • Loading branch information...
1 parent 3cca016 commit 6ca495b8868afadf0923b72a62120b0cae314cc7 @dleffler dleffler committed Mar 29, 2012
View
10 CHANGELOG
@@ -7,17 +7,17 @@ Added / Fixed / changed for 2.0.6
# This release focuses on usability features and security
- incorporates all fixes from v2.0.5 patches
- adds publish/unpublish dates and 'draft' feature to blog
- - adds WYSIWYG comments
+ - implements WYSIWYG comments
- adds aggregated content indicator with command to move item into current module
- fixes a plural/singular MVC naming issue to provide more fluid integration (developer feature)
- -- photoalbum, faq, & filedownloads; fixed during the upgrade
+ -- photoalbum, faq, & filedownloads; all fixed during the upgrade
- upgrade scripts now run when versions are equal to allow better upgrading from develop code
-- also adds 'optional' upgrade scripts; includes optional deprecated headline controller removal
- prevent installation/upgrade over 0.9x database (must be a clean install then migrate old db)
- - adds cURL library support requirement to installation
- - enhanced podcast/rss feeds, deprecates 1.0 (calendar) rss in favor of ical feed
+ -- adds cURL library support requirement to installation
+ - enhanced podcast/rss feeds; deprecates 1.0/calendar rss, in favor of ical feed
- adds true Finnish (machine) translation
- - adds additional security checking
+ - adds additional url security checking
- plus other tweaks, fixes, and features
Added / Fixed / changed for 2.0.5
View
6 framework/core/subsystems/expVersion.php
@@ -171,13 +171,13 @@ private static function iterateType($type) {
case 'release-candidate':
$typenum = 3;
break;
- case 'develop':
+ case 'develop': // code from the github develop branch
$typenum = 5;
break;
- case '': // stable
+ case '': // stable release
$typenum = 10;
break;
- case 'patch': // a patch trumps the stable version of the same version number
+ case 'patch': // a patch trumps the stable version of the same version number
$typenum = 20;
break;
default:
View
2 framework/modules/users/controllers/usersController.php
@@ -701,7 +701,7 @@ public function update_memberships() {
}
- public function getFilesByJSON() {
+ public function getUsersByJSON() {
global $db,$user;
$modelname = $this->basemodel_name;
$results = 25; // default get all
View
2 framework/modules/users/views/users/manage.tpl
@@ -140,7 +140,7 @@
{ label:"Actions",label:"", sortable:false,formatter: formatactions}
];
// DataSource instance
- var myDataSource = new YAHOO.util.DataSource(EXPONENT.URL_FULL+"index.php?controller=users&action=getFilesByJSON&json=1&ajax_action=1&");
+ var myDataSource = new YAHOO.util.DataSource(EXPONENT.URL_FULL+"index.php?controller=users&action=getUsersByJSON&json=1&ajax_action=1&");
myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
myDataSource.responseSchema = {
resultsList: "records",

0 comments on commit 6ca495b

Please sign in to comment.
Something went wrong with that request. Please try again.