Peter M. Groen / knowledgetree

Commit 3db5ea917ecf7b03f58b53944a94969217d2366d

Authored by kevin_fourie
1 parent bd79732d

Merged in from DEV trunk... 

"KTS-1880"
"Upgrading from 3.0.3 to 3.3.5, has lost the information on who created the folders"
Fixed.

Reviewed By: Kevin Fourie

"KTS-2056"
"Hard-coded on-screen text refers to a button that does not exist."
Fixed.

Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6776 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 5 changed files with 8 additions and 16 deletions
bin/expungeall.php
  View file @3db5ea9
... ... @@ -51,10 +51,10 @@ $password = $config->get('autoexpunge/password','admin');
51 51 $maximum = $config->get('autoexpunge/maximum',50);
52 52  
53 53 $ktapi = new KTAPI();
54   -$result = $ktapi->start_session($user, $password);
55   -if (PEAR::isError($result))
  54 +$session = $ktapi->start_session($user, $password);
  55 +if (PEAR::isError($session))
56 56 {
57   - print $result->getMessage() . "\n";
  57 + print $session->getMessage() . "\n";
58 58 return;
59 59 }
60 60  
... ... @@ -68,6 +68,7 @@ $count = count($rows);
68 68 if ($count == 0)
69 69 {
70 70 print "Nothing to do.\n";
  71 + $session->logout();
71 72 return;
72 73 }
73 74  
... ... @@ -93,4 +94,5 @@ $end_time = time();
93 94 $diff = $end_time - $start_time;
94 95  
95 96 print "\ndone. $diff seconds.\n";
  97 +$session->logout();
96 98 ?>
97 99 \ No newline at end of file
... ...
plugins/ktcore/KTColumns.inc.php
  View file @3db5ea9
... ... @@ -279,22 +279,13 @@ class AdvancedUserColumn extends AdvancedColumn {
279 279  
280 280 class CreatorColumn extends AdvancedUserColumn {
281 281 var $document_field_function = "getCreatorID";
282   - var $folder_field_function = null;
  282 + var $folder_field_function = "getCreatorID";
283 283 var $sortable = true; // by default
284 284 var $namespace = 'ktcore.columns.creator';
285 285  
286 286 function CreatorColumn() {
287 287 $this->label = _kt("Creator"); // abstract.
288 288 }
289   -
290   - function addToFolderQuery() {
291   - return array(null, null, null);
292   - }
293   - function addToDocumentQuery() {
294   - $sUsersTable = KTUtil::getTableName('users');
295   - $sJoinSQL = "LEFT JOIN $sUsersTable AS users_order_join ON (D.creator_id = users_order_join.id)";
296   - return array($sJoinSQL, null, "users_order_join.name");
297   - }
298 289 }
299 290  
300 291 class AdvancedSelectionColumn extends AdvancedColumn {
... ...
plugins/ktstandard/contents/RtfIndexer.php
  View file @3db5ea9
... ... @@ -54,7 +54,7 @@ class KTRtfIndexerTrigger extends KTBaseIndexerTrigger {
54 54  
55 55 // can't find the local command.
56 56 if (empty($sCommand)) {
57   - return sprintf(_kt('Unable to find required command for indexing. Please ensure that <strong>%s</strong> is installed and in the %d Path. For more information on indexers and helper applications, please <a href="%s">visit the %d site</a>.'), $this->command, $this->support_url, APP_NAME);
  57 + return sprintf(_kt('Unable to find required command for indexing. Please ensure that <strong>%s</strong> is installed and in the %s Path. For more information on indexers and helper applications, please <a href="%s">visit the %s site</a>.'), $this->command, APP_NAME, $this->support_url, APP_NAME);
58 58 }
59 59  
60 60 return null;
... ...
resources/css/kt-login.css
  View file @3db5ea9
... ... @@ -70,6 +70,7 @@
70 70 padding-left: 0px;
71 71 border-left: 1px solid #eee;
72 72 margin-left: -1px;
  73 + overflow: auto;
73 74 }
74 75  
75 76 #disclaimerbox p {
... ...
setup/upgrade.php
  View file @3db5ea9
... ... @@ -510,8 +510,6 @@ You can continue to do the backup manually using the following process:
510 510 <nobr><?=$stmt['display']?>
511 511 </table>
512 512 <P>
513   -Press <i>continue to backup</i> to attempt the command(s) above.
514   -<P>
515 513  
516 514 &nbsp;&nbsp; &nbsp; &nbsp; <input type=button value="back" onclick="javascript:do_start('home')"> &nbsp;&nbsp; &nbsp; &nbsp;
517 515  
... ...