[evolvis-commits] r18189: small-fixes pending merges:↵ Thorsten Glaser 2012-03-14 when using minijson to provide json_encode(), do not indent↵ Thorsten Glaser 2012-03-14 use minijson_encode, indent when rendering as text only
mirabilos at evolvis.org
mirabilos at evolvis.org
Wed Mar 14 19:58:57 CET 2012
Author: mirabilos
Date: 2012-03-14 19:58:56 +0100 (Wed, 14 Mar 2012)
New Revision: 18189
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php
trunk/gforge_base/evolvisforge-5.1/src/www/pm/t_lookup.php
Log:
small-fixes pending merges:
Thorsten Glaser 2012-03-14 when using minijson to provide json_encode(), do not indent
Thorsten Glaser 2012-03-14 use minijson_encode, indent when rendering as text only
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php 2012-03-14 18:58:49 UTC (rev 18188)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php 2012-03-14 18:58:56 UTC (rev 18189)
@@ -1300,7 +1300,7 @@
if (!function_exists('json_encode')) {
require_once $gfcommon.'include/minijson.php' ;
function json_encode ($a1) {
- return minijson_encode ($a1) ;
+ return minijson_encode($a1, false);
}
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/t_lookup.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/t_lookup.php 2012-03-14 18:58:49 UTC (rev 18188)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/t_lookup.php 2012-03-14 18:58:56 UTC (rev 18189)
@@ -26,27 +26,38 @@
require_once('../env.inc.php');
require_once $gfcommon.'include/pre.php';
+require_once $gfcommon.'include/minijson.php';
require_once $gfcommon.'pm/ProjectTaskSqlQueries.php';
+/*-
+ * We have things like protected properties. We have abstract methods.
+ * We have all this stuff that your computer science teacher told you
+ * you should be using. I don't care about this crap at all.
+ * -- Rasmus Lerdorf
+ */
+
$tid = getIntFromRequest('tid');
if (!$tid)
$tid = util_path_info_last_numeric_component();
if (!$tid) {
- exit_missing_param('',array(_('Task ID')),'pm');
+ exit_missing_param('', array(_('Task ID')), 'pm');
}
$tinfo = getGroupProjectIdGroupId($tid);
if (!$tinfo) {
- exit_error(_('No Task with ID: ').$tid,'pm');
+ exit_error(_('No Task with ID: ') . $tid, 'pm');
}
$asuser = getStringFromRequest('asuser');
-if (getIntFromRequest('text'))
+if (getIntFromRequest('text')) {
$asformat = "text/plain; charset=\"UTF-8\"";
-else
+ $jsonindent = "";
+} else {
$asformat = "application/json; charset=\"UTF-8\"";
+ $jsonindent = false;
+}
$islogin = session_loggedin();
$isadmin = forge_check_global_perm ('forge_admin');
@@ -83,6 +94,5 @@
$tinfo['forge_name'] = forge_get_config ('forge_name') ;
sysdebug_off("Content-type: " . $asformat);
-setup_gettext_from_langname ('English') ;
-echo json_encode($tinfo) . "\n";
+echo minijson_encode($tinfo, $jsonindent) . "\n";
exit;
More information about the evolvis-commits
mailing list