dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
10a0d9d
)
Show a more useful message when someone tries enabling profileinfo but hasn't created...
author
Chad Horohoe
<demon@users.mediawiki.org>
Thu, 8 Sep 2011 14:53:07 +0000
(14:53 +0000)
committer
Chad Horohoe
<demon@users.mediawiki.org>
Thu, 8 Sep 2011 14:53:07 +0000
(14:53 +0000)
profileinfo.php
patch
|
blob
|
history
diff --git
a/profileinfo.php
b/profileinfo.php
index
3117db3
..
b47033a
100644
(file)
--- a/
profileinfo.php
+++ b/
profileinfo.php
@@
-78,6
+78,17
@@
if ( !$wgEnableProfileInfo ) {
exit( 1 );
}
exit( 1 );
}
+$dbr = wfGetDB( DB_SLAVE );
+
+if( !$dbr->tableExists( 'profileinfo' ) ) {
+ echo "<p>No 'profileinfo' table exists, so we can't show you anything.</p>\n";
+ echo "<p>If you want to log profiling data, create the table using "
+ . "<tt>maintenance/archives/patch-profiling.sql</tt> and enable "
+ . "<tt>\$wgProfileToDatabase</tt>.</p>\n";
+ echo "</body></html>";
+ exit( 1 );
+}
+
$expand = array();
if ( isset( $_REQUEST['expand'] ) )
foreach( explode( ',', $_REQUEST['expand'] ) as $f )
$expand = array();
if ( isset( $_REQUEST['expand'] ) )
foreach( explode( ',', $_REQUEST['expand'] ) as $f )
@@
-218,8
+229,6
@@
$sort = 'time';
if ( isset( $_REQUEST['sort'] ) && in_array( $_REQUEST['sort'], $sorts ) )
$sort = $_REQUEST['sort'];
if ( isset( $_REQUEST['sort'] ) && in_array( $_REQUEST['sort'], $sorts ) )
$sort = $_REQUEST['sort'];
-
-$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) );
if (isset( $_REQUEST['filter'] ) )
$res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) );
if (isset( $_REQUEST['filter'] ) )